remove no necessary write with offset instrumentation

DataDog · May 13, 2024 · 75a330f · 75a330f
1 parent 17189dc
commit 75a330f
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 28 deletions.
diff --git a/...-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java b/...-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
@@ -15,7 +15,6 @@ 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)")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(java.lang.String, int, int)")
   public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
     final XssModule module = InstrumentationBridge.XSS;
     if (module != null) {

diff --git a/...ava/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java b/...ava/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
@@ -17,7 +17,6 @@ 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[])")
-  @CallSite.Before("void jakarta.servlet.jsp.JspWriter.write(char[], int, int)")
   public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
     final XssModule module = InstrumentationBridge.XSS;
     if (module != null) {

diff --git a/...ent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterCallsiteTest.groovy b/...ent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterCallsiteTest.groovy
@@ -34,10 +34,8 @@ class JakartaJspWriterCallsiteTest extends AgentTestRunner{
     "printTest" | [STRING]  | 1
     "printlnTest" | [STRING]  | 1
     "write" | [STRING]  | 1
-    "write" | [STRING, 0, 0]  | 1
     "printTest" | [CHAR_ARRAY]  | 0
     "printlnTest" | [CHAR_ARRAY]  | 0
     "write" | [CHAR_ARRAY]  | 0
-    "write" | [CHAR_ARRAY, 0, 0]  | 0
   }
 }
diff --git a/...tation/servlet/request-5/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy b/...tation/servlet/request-5/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy
@@ -34,10 +34,8 @@ class JakartaJspWriterFullDetectionCallsiteTest extends AgentTestRunner{
     "printTest" | [STRING]
     "printlnTest" | [STRING]
     "write" | [STRING]
-    "write" | [STRING, 0, 0]
     "printTest" | [CHAR_ARRAY]
     "printlnTest" | [CHAR_ARRAY]
     "write" | [CHAR_ARRAY]
-    "write" | [CHAR_ARRAY, 0, 0]
   }
 }
diff --git a/...instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java b/...instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
@@ -34,12 +34,4 @@ public void write(char s[]) throws IOException {
   public void write(String s) throws IOException {
     writer.write(s);
   }
-
-  public void write(String s, int i, int j) throws IOException {
-    writer.write(s, i, j);
-  }
-
-  public void write(char s[], int i, int j) throws IOException {
-    writer.write(s, i, j);
-  }
 }
diff --git a/...on/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java b/...on/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
@@ -15,7 +15,6 @@ 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)")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.write(java.lang.String, int, int)")
   public static void beforeStringParam(@CallSite.Argument(0) @Nonnull final String s) {
     final XssModule module = InstrumentationBridge.XSS;
     if (module != null) {

diff --git a/...c/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java b/...c/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
@@ -17,7 +17,6 @@ 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[])")
-  @CallSite.Before("void javax.servlet.jsp.JspWriter.write(char[], int, int)")
   public static void beforeCharArrayParam(@CallSite.Argument(0) @Nonnull final char[] buf) {
     final XssModule module = InstrumentationBridge.XSS;
     if (module != null) {

diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterCallSiteTest.groovy
@@ -34,10 +34,8 @@ class JspWriterCallSiteTest extends AgentTestRunner{
     "printTest" | [STRING]  | 1
     "printlnTest" | [STRING]  | 1
     "write" | [STRING]  | 1
-    "write" | [STRING, 0, 0]  | 1
     "printTest" | [CHAR_ARRAY]  | 0
     "printlnTest" | [CHAR_ARRAY]  | 0
     "write" | [CHAR_ARRAY]  | 0
-    "write" | [CHAR_ARRAY, 0, 0]  | 0
   }
 }
diff --git a/...a-agent/instrumentation/servlet/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy b/...a-agent/instrumentation/servlet/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy
@@ -35,10 +35,8 @@ class JspWriterFullDetectionCallSiteTest extends AgentTestRunner{
     "printTest" | [STRING]
     "printlnTest" | [STRING]
     "write" | [STRING]
-    "write" | [STRING, 0, 0]
     "printTest" | [CHAR_ARRAY]
     "printlnTest" | [CHAR_ARRAY]
     "write" | [CHAR_ARRAY]
-    "write" | [CHAR_ARRAY, 0, 0]
   }
 }
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/foo/bar/TestJspWriterSuite.java b/dd-java-agent/instrumentation/servlet/src/test/java/foo/bar/TestJspWriterSuite.java
@@ -34,12 +34,4 @@ public void write(char s[]) throws IOException {
   public void write(String s) throws IOException {
     writer.write(s);
   }
-
-  public void write(String s, int i, int j) throws IOException {
-    writer.write(s, i, j);
-  }
-
-  public void write(char s[], int i, int j) throws IOException {
-    writer.write(s, i, j);
-  }
 }