set name on streams/readers

bubble-server/src/main/java/bubble/rule/AbstractAppRuleDriver.java

@@ -161,14 +161,18 @@ public abstract class AbstractAppRuleDriver implements AppRuleDriver {
                 + getScriptClose();
 
         final RegexReplacementFilter filter = new RegexReplacementFilter(getInsertionRegex(), replacement);
-        RegexFilterReader reader = new RegexFilterReader(new InputStreamReader(in), filter).setMaxMatches(1);
+        final String filterNamePrefix = getClass().getSimpleName()+".filterInsertJs(" + filterRequest.getUrl() + "): ";
+        RegexFilterReader reader = new RegexFilterReader(new InputStreamReader(in), filter)
+                .setName(filterNamePrefix + getInsertionRegex())
+                .setMaxMatches(1);
         if (modConfig.hasAdditionalRegexReplacements()) {
             for (BubbleRegexReplacement re : modConfig.getAdditionalRegexReplacements()) {
                 final RegexReplacementFilter f = new RegexReplacementFilter(
                         re.getInsertionRegex(),
                         re.getReplacement().replace(NONCE_VAR, filterRequest.getScriptNonce())
                 );
-                reader = new RegexFilterReader(reader, f);
+                reader = new RegexFilterReader(reader, f)
+                        .setName(filterNamePrefix+" additional: "+re.getInsertionRegex());
             }
         }
 

bubble-server/src/main/java/bubble/service/stream/ActiveStreamState.java

@@ -56,7 +56,7 @@ class ActiveStreamState {
         this.encoding = request.getEncoding();
         this.firstRule = rules.get(0);
 
-        final String prefix = "ActiveStreamState("+requestId+"): ";
+        final String prefix = "ActiveStreamState("+reqId()+"): ";
         if (empty(rules)) {
             if (log.isDebugEnabled()) log.debug(prefix+"no rules, returning passthru");
             passthru = true;
@@ -70,6 +70,8 @@ class ActiveStreamState {
         }
     }
 
+    private String reqId() { return requestId+":"+request.getUrl(); }
+
     public boolean noApplicableRules(List<AppRuleHarness> rules) {
         for (AppRuleHarness appRule : rules) {
             if (appRule.getDriver().couldModify(request)) {
@@ -101,7 +103,7 @@ class ActiveStreamState {
             totalBytesWritten += chunk.length;
             final ByteArrayInputStream chunkStream = new ByteArrayInputStream(chunk);
             if (multiStream == null) {
-                multiStream = new MultiStream(chunkStream);
+                multiStream = new MultiStream(chunkStream, reqId());
             } else {
                 multiStream.addStream(chunkStream);
             }
@@ -119,7 +121,7 @@ class ActiveStreamState {
         totalBytesWritten += chunk.length;
         final ByteArrayInputStream chunkStream = new ByteArrayInputStream(chunk);
         if (multiStream == null) {
-            multiStream = new MultiStream(chunkStream, true);
+            multiStream = new MultiStream(chunkStream, true, reqId());
         } else {
             multiStream.addLastStream(chunkStream);
         }

utils/cobbzilla-utils

@@ -1 +1 @@
-Subproject commit f1f0c443a93562b89df0ba27aaae81feab8d5f3c
+Subproject commit a0909c78b69cdb197a6e55a909855b9e4ecec4eb