Cap depserver log lines of blaze stderr lines at 1000 chars. Implement both this and commit 116c2f6724718fc408e0c73c9026d89281c75e87 using Guava's Ascii#truncate.

--
MOS_MIGRATED_REVID=126198762

1 files changed, 5 insertions, 9 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
index 834b69d410..1865381c9c 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/SkyQueryEnvironment.java
@@ -14,6 +14,7 @@
 package com.google.devtools.build.lib.query2;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ascii;
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -231,13 +232,6 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target>
     ExecutorUtil.interruptibleShutdown(threadPool);
   }
 
-  private static String getLogString(QueryExpression queryExpression) {
-    String queryExpressionString = queryExpression.toString();
-    return queryExpressionString.length() <= MAX_QUERY_EXPRESSION_LOG_CHARS
-        ? queryExpressionString
-        : queryExpressionString.substring(0, MAX_QUERY_EXPRESSION_LOG_CHARS) + "...[truncated]";
-  }
-
   @Override
   public QueryExpression transformParsedQuery(QueryExpression queryExpression) {
     // Transform each occurrence of an expressions of the form 'rdeps(<universeScope>, <T>)' to
@@ -271,8 +265,10 @@ public class SkyQueryEnvironment extends AbstractBlazeQueryEnvironment<Target>
     QueryExpression transformedQueryExpression = queryExpression.getMapped(rdepsToAllRDepsMapper);
     LOG.info(String.format(
         "transformed query [%s] to [%s]",
-        getLogString(queryExpression),
-        getLogString(transformedQueryExpression)));
+        Ascii.truncate(
+            queryExpression.toString(), MAX_QUERY_EXPRESSION_LOG_CHARS, "[truncated]"),
+        Ascii.truncate(
+            transformedQueryExpression.toString(), MAX_QUERY_EXPRESSION_LOG_CHARS, "[truncated]")));
     return transformedQueryExpression;
   }