Make header value computation in request logging lazy (#2367)

zio · Aug 12, 2023 · 05158cd · 05158cd
1 parent 5911532
commit 05158cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/zio-http/src/main/scala/zio/http/HandlerAspect.scala b/zio-http/src/main/scala/zio/http/HandlerAspect.scala
@@ -705,12 +705,12 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
 
           ZIO
             .logLevel(level(response.status)) {
-              val requestHeaders  =
+              def requestHeaders  =
                 request.headers.collect {
                   case header: Header if loggedRequestHeaderNames.contains(header.headerName.toLowerCase) =>
                     LogAnnotation(header.headerName, header.renderedValue)
                 }.toSet
-              val responseHeaders =
+              def responseHeaders =
                 response.headers.collect {
                   case header: Header if loggedResponseHeaderNames.contains(header.headerName.toLowerCase) =>
                     LogAnnotation(header.headerName, header.renderedValue)

diff --git a/zio-http/src/main/scala/zio/http/ZClientAspect.scala b/zio-http/src/main/scala/zio/http/ZClientAspect.scala
@@ -213,12 +213,12 @@ object ZClientAspect {
                 case (duration, Exit.Success(response)) =>
                   ZIO
                     .logLevel(level(response.status)) {
-                      val requestHeaders  =
+                      def requestHeaders  =
                         headers.collect {
                           case header: Header if loggedRequestHeaderNames.contains(header.headerName.toLowerCase) =>
                             LogAnnotation(header.headerName, header.renderedValue)
                         }.toSet
-                      val responseHeaders =
+                      def responseHeaders =
                         response.headers.collect {
                           case header: Header if loggedResponseHeaderNames.contains(header.headerName.toLowerCase) =>
                             LogAnnotation(header.headerName, header.renderedValue)