apply suggestions

amarziali · amarziali · commit a74b70798cbc · 2025-08-08T10:22:27.000+02:00
(cherry picked from commit 21afeb2)
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
@@ -154,7 +154,7 @@ private int arrayContains(byte[] array, int off, int len, byte[] search) {
 
   private void drain() throws IOException {
     if (count > 0) {
-      boolean tmpFilter = filter;
+      boolean wasFiltering = filter;
       filter = false;
       wasDraining = true;
       int start = (pos - count + lookbehind.length) % lookbehind.length;
@@ -163,7 +163,7 @@ private void drain() throws IOException {
         downstream.write(lookbehind[(start + i) % lookbehind.length]);
         count--;
       }
-      filter = tmpFilter;
+      filter = wasFiltering;
       wasDraining = false;
     }
   }
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
@@ -114,12 +114,12 @@ public void write(char[] array, int off, int len) throws IOException {
           write(array[i]);
         }
         drain();
-        boolean tmpFilter = filter;
+        boolean wasFiltering = filter;
 
         // will be reset if no errors after the following write
         filter = false;
         downstream.write(array, off + marker.length - 1, len - bulkWriteThreshold);
-        filter = tmpFilter;
+        filter = wasFiltering;
 
         for (int i = len - marker.length + 1; i < len; i++) {
           write(array[i]);
@@ -155,7 +155,7 @@ private int arrayContains(char[] array, int off, int len, char[] search) {
 
   private void drain() throws IOException {
     if (count > 0) {
-      boolean tmpFilter = filter;
+      boolean wasFiltering = filter;
       filter = false;
       wasDraining = true;
       int start = (pos - count + lookbehind.length) % lookbehind.length;
@@ -164,7 +164,7 @@ private void drain() throws IOException {
         downstream.write(lookbehind[(start + i) % lookbehind.length]);
         count--;
       }
-      filter = tmpFilter;
+      filter = wasFiltering;
       wasDraining = false;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private int arrayContains(byte[] array, int off, int len, byte[] search) {`
`154`	`154`
`155`	`155`	`private void drain() throws IOException {`
`156`	`156`	`if (count > 0) {`
`157`		`- boolean tmpFilter = filter;`
	`157`	`+ boolean wasFiltering = filter;`
`158`	`158`	`filter = false;`
`159`	`159`	`wasDraining = true;`
`160`	`160`	`int start = (pos - count + lookbehind.length) % lookbehind.length;`
`@@ -163,7 +163,7 @@ private void drain() throws IOException {`
`163`	`163`	`downstream.write(lookbehind[(start + i) % lookbehind.length]);`
`164`	`164`	`count--;`
`165`	`165`	`}`
`166`		`- filter = tmpFilter;`
	`166`	`+ filter = wasFiltering;`
`167`	`167`	`wasDraining = false;`
`168`	`168`	`}`
`169`	`169`	`}`