PR issues

Author: jandro996

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/blocking/BlockingActionHelper.java

@@ -12,6 +12,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.slf4j.Logger;
@@ -135,9 +136,9 @@ public static byte[] getTemplate(TemplateType type, String securityResponseId) {
     String replacementValue =
         (securityResponseId == null || securityResponseId.isEmpty()) ? "" : securityResponseId;
 
-    String templateString = new String(template, java.nio.charset.StandardCharsets.UTF_8);
+    String templateString = new String(template, StandardCharsets.UTF_8);
     String replacedTemplate = templateString.replace("[security_response_id]", replacementValue);
-    return replacedTemplate.getBytes(java.nio.charset.StandardCharsets.UTF_8);
+    return replacedTemplate.getBytes(StandardCharsets.UTF_8);
   }
 
   public static String getContentType(TemplateType type) {

dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyBlockingHelper.java

@@ -48,16 +48,6 @@ public static boolean block(
         context);
   }
 
-  public static boolean block(
-      Request request,
-      Response response,
-      int statusCode,
-      BlockingContentType bct,
-      Map<String, String> extraHeaders,
-      Context context) {
-    return block(request, response, statusCode, bct, extraHeaders, null, context);
-  }
-
   public static boolean block(
       Request request,
       Response response,

dd-java-agent/instrumentation/grizzly/grizzly-2.0/src/main/java/datadog/trace/instrumentation/grizzly/GrizzlyDecorator.java

@@ -103,6 +103,7 @@ public boolean tryCommitBlockingResponse(
           statusCode,
           templateType,
           extraHeaders,
+          securityResponseId,
           agentSpan);
     }
   }