Merge pull request #10951 from hashicorp/b-cn-proxy

consul/connect: avoid warn messages on connect proxy errors
hashicorp · Aug 26, 2021 · de955b7 · de955b7
1 parent 6f44f78
commit de955b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.changelog/10951.txt b/.changelog/10951.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+consul/connect: Reduced the noise of log messages emitted for connect native tasks
+```
diff --git a/client/allocrunner/consul_grpc_sock_hook.go b/client/allocrunner/consul_grpc_sock_hook.go
@@ -313,10 +313,10 @@ func proxyConn(ctx context.Context, logger hclog.Logger, destAddr string, conn n
 		defer cancel()
 		n, err := io.Copy(dest, conn)
 		if ctx.Err() == nil && err != nil {
-			logger.Warn("error proxying to Consul", "error", err, "dest", destAddr,
-				"src_local", conn.LocalAddr(), "src_remote", conn.RemoteAddr(),
-				"bytes", n,
-			)
+			// expect disconnects when proxying http
+			logger.Trace("error message received proxying to Consul",
+				"msg", err, "dest", destAddr, "src_local", conn.LocalAddr(),
+				"src_remote", conn.RemoteAddr(), "bytes", n)
 			return
 		}
 		logger.Trace("proxy to Consul complete",
@@ -332,10 +332,9 @@ func proxyConn(ctx context.Context, logger hclog.Logger, destAddr string, conn n
 		defer cancel()
 		n, err := io.Copy(conn, dest)
 		if ctx.Err() == nil && err != nil {
-			logger.Warn("error proxying from Consul", "error", err, "dest", destAddr,
-				"src_local", conn.LocalAddr(), "src_remote", conn.RemoteAddr(),
-				"bytes", n,
-			)
+			logger.Trace("error message received proxying from Consul",
+				"msg", err, "dest", destAddr, "src_local", conn.LocalAddr(),
+				"src_remote", conn.RemoteAddr(), "bytes", n)
 			return
 		}
 		logger.Trace("proxy from Consul complete",