diff --git a/zio-http/src/main/scala/zio/http/netty/AsyncBodyReader.scala b/zio-http/src/main/scala/zio/http/netty/AsyncBodyReader.scala index 873825d4de..55e752106f 100644 --- a/zio-http/src/main/scala/zio/http/netty/AsyncBodyReader.scala +++ b/zio-http/src/main/scala/zio/http/netty/AsyncBodyReader.scala @@ -16,6 +16,7 @@ package zio.http.netty +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Chunk, ChunkBuilder, Trace, Unsafe} import zio.http.netty.AsyncBodyReader.State @@ -24,7 +25,6 @@ import zio.http.netty.NettyBody.UnsafeAsync import io.netty.buffer.ByteBufUtil import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler} import io.netty.handler.codec.http.{HttpContent, LastHttpContent} - abstract class AsyncBodyReader(implicit trace: Trace) extends SimpleChannelInboundHandler[HttpContent](true) { protected val unsafeClass: Unsafe = Unsafe.unsafe diff --git a/zio-http/src/main/scala/zio/http/netty/ChannelFactories.scala b/zio-http/src/main/scala/zio/http/netty/ChannelFactories.scala index 9bb0287cd2..6616c9d2c9 100644 --- a/zio-http/src/main/scala/zio/http/netty/ChannelFactories.scala +++ b/zio-http/src/main/scala/zio/http/netty/ChannelFactories.scala @@ -17,6 +17,7 @@ package zio.http.netty import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import io.netty.channel._ import io.netty.channel.embedded.EmbeddedChannel @@ -24,7 +25,6 @@ import io.netty.channel.epoll._ import io.netty.channel.kqueue._ import io.netty.channel.socket.nio._ import io.netty.incubator.channel.uring._ - object ChannelFactories { private[zio] def make[A <: Channel](channel: => A)(implicit trace: Trace): UIO[ChannelFactory[A]] = diff --git a/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala b/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala index 5d848b5d27..e996b3e600 100644 --- a/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala +++ b/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala @@ -19,6 +19,7 @@ package zio.http.netty import java.util.concurrent.Executor import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import io.netty.channel._ import io.netty.channel.epoll.{Epoll, EpollEventLoopGroup} diff --git a/zio-http/src/main/scala/zio/http/netty/NettyBody.scala b/zio-http/src/main/scala/zio/http/netty/NettyBody.scala index 56175feb46..f41ba2dd09 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyBody.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyBody.scala @@ -18,6 +18,7 @@ package zio.http.netty import java.nio.charset.Charset +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Chunk, Task, Trace, Unsafe, ZIO} import zio.stream.ZStream @@ -29,7 +30,6 @@ import zio.http.{Body, Boundary, Header, Headers, MediaType} import io.netty.buffer.{ByteBuf, ByteBufUtil} import io.netty.channel.{Channel => JChannel} import io.netty.util.AsciiString - object NettyBody extends BodyEncoding { /** diff --git a/zio-http/src/main/scala/zio/http/netty/NettyBodyWriter.scala b/zio-http/src/main/scala/zio/http/netty/NettyBodyWriter.scala index 636b4c72fb..198c5d7490 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyBodyWriter.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyBodyWriter.scala @@ -18,6 +18,7 @@ package zio.http.netty import zio.Chunk.ByteArray import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.Body import zio.http.Body._ @@ -26,10 +27,9 @@ import zio.http.netty.NettyBody.{AsciiStringBody, AsyncBody, ByteBufBody, Unsafe import io.netty.buffer.Unpooled import io.netty.channel._ import io.netty.handler.codec.http.{DefaultHttpContent, LastHttpContent} - object NettyBodyWriter { - def write(body: Body, ctx: ChannelHandlerContext): ZIO[Any, Throwable, Boolean] = + def write(body: Body, ctx: ChannelHandlerContext)(implicit trace: Trace): ZIO[Any, Throwable, Boolean] = body match { case body: ByteBufBody => ZIO.succeed { diff --git a/zio-http/src/main/scala/zio/http/netty/NettyChannel.scala b/zio-http/src/main/scala/zio/http/netty/NettyChannel.scala index c04de98de0..411215a855 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyChannel.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyChannel.scala @@ -16,12 +16,12 @@ package zio.http.netty +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Task, Trace, UIO, ZIO} import zio.http.Channel import io.netty.channel.{Channel => JChannel, ChannelFuture => JChannelFuture} - final case class NettyChannel[-A]( private val channel: JChannel, private val convert: A => Any, diff --git a/zio-http/src/main/scala/zio/http/netty/NettyConfig.scala b/zio-http/src/main/scala/zio/http/netty/NettyConfig.scala index aa87ed25d8..5417e83366 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyConfig.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyConfig.scala @@ -17,11 +17,11 @@ package zio.http.netty import zio.Config +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.netty.NettyConfig.LeakDetectionLevel import io.netty.util.ResourceLeakDetector - final case class NettyConfig( leakDetectionLevel: LeakDetectionLevel, channelType: ChannelType, diff --git a/zio-http/src/main/scala/zio/http/netty/NettyCookieEncoding.scala b/zio-http/src/main/scala/zio/http/netty/NettyCookieEncoding.scala index f49b0e8c66..d5d84d1287 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyCookieEncoding.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyCookieEncoding.scala @@ -19,6 +19,7 @@ package zio.http.netty import java.time.Duration import zio.Chunk +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.Cookie.SameSite import zio.http.internal.CookieEncoding diff --git a/zio-http/src/main/scala/zio/http/netty/NettyFutureExecutor.scala b/zio-http/src/main/scala/zio/http/netty/NettyFutureExecutor.scala index 1af50e0c30..b57676c3eb 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyFutureExecutor.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyFutureExecutor.scala @@ -19,6 +19,7 @@ package zio.http.netty import java.util.concurrent.CancellationException import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import io.netty.util.concurrent.{Future, GenericFutureListener} diff --git a/zio-http/src/main/scala/zio/http/netty/NettyResponse.scala b/zio-http/src/main/scala/zio/http/netty/NettyResponse.scala index 66a8ab40fd..1e2227d543 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyResponse.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyResponse.scala @@ -16,6 +16,7 @@ package zio.http.netty +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Promise, Trace, Unsafe, ZIO} import zio.http.Response.NativeResponse @@ -31,6 +32,7 @@ object NettyResponse { final def make(ctx: ChannelHandlerContext, jRes: FullHttpResponse)(implicit unsafe: Unsafe, + trace: Trace, ): NativeResponse = { val status = Conversions.statusFromNetty(jRes.status()) val headers = Conversions.headersFromNetty(jRes.headers()) diff --git a/zio-http/src/main/scala/zio/http/netty/NettyResponseEncoder.scala b/zio-http/src/main/scala/zio/http/netty/NettyResponseEncoder.scala index c7d9451017..744bdb8765 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyResponseEncoder.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyResponseEncoder.scala @@ -19,6 +19,7 @@ package zio.http.netty import java.util.concurrent.ConcurrentHashMap import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http._ import zio.http.netty.model.Conversions @@ -31,7 +32,7 @@ private[zio] object NettyResponseEncoder { private val frozenCache = new ConcurrentHashMap[Response, FullHttpResponse]() private val frozenZioCache = new ConcurrentHashMap[Response, UIO[HttpResponse]]() - def encode(response: Response): ZIO[Any, Throwable, HttpResponse] = { + def encode(response: Response)(implicit trace: Trace): ZIO[Any, Throwable, HttpResponse] = { val body = response.body if (body.isComplete) { val cachedValue = frozenZioCache.get(response) @@ -47,7 +48,7 @@ private[zio] object NettyResponseEncoder { } } - def fastEncode(response: Response, bytes: Array[Byte])(implicit unsafe: Unsafe): FullHttpResponse = + def fastEncode(response: Response, bytes: Array[Byte])(implicit unsafe: Unsafe, trace: Trace): FullHttpResponse = if (response.frozen) { val encodedResponse = frozenCache.get(response) diff --git a/zio-http/src/main/scala/zio/http/netty/NettyRuntime.scala b/zio-http/src/main/scala/zio/http/netty/NettyRuntime.scala index 56ab32b263..92192a37e5 100644 --- a/zio-http/src/main/scala/zio/http/netty/NettyRuntime.scala +++ b/zio-http/src/main/scala/zio/http/netty/NettyRuntime.scala @@ -17,6 +17,7 @@ package zio.http.netty import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import io.netty.channel._ import io.netty.util.concurrent.{Future, GenericFutureListener} @@ -78,7 +79,9 @@ private[zio] trait NettyRuntime { self => )(implicit unsafe: Unsafe, trace: Trace): Unit = run(ctx, ensured, interruptOnClose = false)(program) - private def closeListener(rtm: Runtime[Any], fiber: Fiber.Runtime[_, _]): GenericFutureListener[Future[_ >: Void]] = + private def closeListener(rtm: Runtime[Any], fiber: Fiber.Runtime[_, _])(implicit + trace: Trace, + ): GenericFutureListener[Future[_ >: Void]] = (_: Future[_ >: Void]) => { val _ = rtm.unsafe.fork { fiber.interrupt diff --git a/zio-http/src/main/scala/zio/http/netty/WebSocketAppHandler.scala b/zio-http/src/main/scala/zio/http/netty/WebSocketAppHandler.scala index 8a37361bf0..4649894ed7 100644 --- a/zio-http/src/main/scala/zio/http/netty/WebSocketAppHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/WebSocketAppHandler.scala @@ -17,6 +17,7 @@ package zio.http.netty import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.ChannelEvent.UserEvent import zio.http.netty.client.ChannelState diff --git a/zio-http/src/main/scala/zio/http/netty/client/ChannelState.scala b/zio-http/src/main/scala/zio/http/netty/client/ChannelState.scala index b378b597e1..413f569c35 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/ChannelState.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/ChannelState.scala @@ -16,6 +16,8 @@ package zio.http.netty.client +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.Status sealed trait ChannelState { self => diff --git a/zio-http/src/main/scala/zio/http/netty/client/ClientInboundHandler.scala b/zio-http/src/main/scala/zio/http/netty/client/ClientInboundHandler.scala index bcc5ddf2c6..a4ba5dad6a 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/ClientInboundHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/ClientInboundHandler.scala @@ -17,6 +17,7 @@ package zio.http.netty.client import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.netty.{NettyBodyWriter, NettyResponse, NettyRuntime} import zio.http.{Request, Response} diff --git a/zio-http/src/main/scala/zio/http/netty/client/ClientResponseStreamHandler.scala b/zio-http/src/main/scala/zio/http/netty/client/ClientResponseStreamHandler.scala index 3607e5cb87..ff937b1d9f 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/ClientResponseStreamHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/ClientResponseStreamHandler.scala @@ -16,6 +16,7 @@ package zio.http.netty.client +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Promise, Trace} import zio.http.Status @@ -23,7 +24,6 @@ import zio.http.netty.{AsyncBodyReader, NettyFutureExecutor, NettyRuntime} import io.netty.channel._ import io.netty.handler.codec.http.{HttpContent, LastHttpContent} - final class ClientResponseStreamHandler( rtm: NettyRuntime, onComplete: Promise[Throwable, ChannelState], diff --git a/zio-http/src/main/scala/zio/http/netty/client/ClientSSLConverter.scala b/zio-http/src/main/scala/zio/http/netty/client/ClientSSLConverter.scala index 5728bdc189..f7a4d3fac6 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/ClientSSLConverter.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/ClientSSLConverter.scala @@ -20,11 +20,12 @@ import java.io.{FileInputStream, InputStream} import java.security.KeyStore import javax.net.ssl.TrustManagerFactory +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.ClientSSLConfig import io.netty.handler.ssl.util.InsecureTrustManagerFactory import io.netty.handler.ssl.{SslContext, SslContextBuilder} - object ClientSSLConverter { private def trustStoreToSslContext(trustStoreStream: InputStream, trustStorePassword: String): SslContext = { val trustStore = KeyStore.getInstance("JKS") diff --git a/zio-http/src/main/scala/zio/http/netty/client/NettyClientDriver.scala b/zio-http/src/main/scala/zio/http/netty/client/NettyClientDriver.scala index 8b2cafe658..807baddadf 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/NettyClientDriver.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/NettyClientDriver.scala @@ -21,6 +21,7 @@ import java.util.concurrent.TimeUnit import scala.collection.mutable import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.ClientDriver.ChannelInterface import zio.http._ @@ -32,7 +33,6 @@ import io.netty.channel.{Channel, ChannelFactory, ChannelHandler, EventLoopGroup import io.netty.handler.codec.http.websocketx.{WebSocketClientProtocolHandler, WebSocketFrame => JWebSocketFrame} import io.netty.handler.codec.http.{FullHttpRequest, HttpObjectAggregator} import io.netty.handler.timeout.ReadTimeoutHandler - final case class NettyClientDriver private ( channelFactory: ChannelFactory[Channel], eventLoopGroup: EventLoopGroup, diff --git a/zio-http/src/main/scala/zio/http/netty/client/NettyConnectionPool.scala b/zio-http/src/main/scala/zio/http/netty/client/NettyConnectionPool.scala index b3e784bdc9..222a6b8b54 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/NettyConnectionPool.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/NettyConnectionPool.scala @@ -20,6 +20,7 @@ import java.net.InetSocketAddress import java.util.concurrent.TimeUnit import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.URL.Location import zio.http._ @@ -36,7 +37,6 @@ import io.netty.channel.{ import io.netty.handler.codec.http.{HttpClientCodec, HttpContentDecompressor} import io.netty.handler.proxy.HttpProxyHandler import io.netty.handler.timeout.ReadTimeoutHandler - trait NettyConnectionPool extends ConnectionPool[JChannel] object NettyConnectionPool { diff --git a/zio-http/src/main/scala/zio/http/netty/client/NettyRequestEncoder.scala b/zio-http/src/main/scala/zio/http/netty/client/NettyRequestEncoder.scala index 080022c370..72d14d89ec 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/NettyRequestEncoder.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/NettyRequestEncoder.scala @@ -16,6 +16,7 @@ package zio.http.netty.client +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Task, Trace, ZIO} import zio.http.Request @@ -24,7 +25,6 @@ import zio.http.netty.model.Conversions import io.netty.buffer.Unpooled import io.netty.handler.codec.http.{DefaultFullHttpRequest, DefaultHttpRequest, HttpHeaderNames, HttpRequest} - private[zio] object NettyRequestEncoder { /** diff --git a/zio-http/src/main/scala/zio/http/netty/client/WebSocketClientInboundHandler.scala b/zio-http/src/main/scala/zio/http/netty/client/WebSocketClientInboundHandler.scala index e52588b026..0c310c86f7 100644 --- a/zio-http/src/main/scala/zio/http/netty/client/WebSocketClientInboundHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/client/WebSocketClientInboundHandler.scala @@ -16,6 +16,7 @@ package zio.http.netty.client +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Promise, Trace, Unsafe} import zio.http.Response @@ -23,7 +24,6 @@ import zio.http.netty.{NettyResponse, NettyRuntime} import io.netty.channel.{ChannelHandlerContext, SimpleChannelInboundHandler} import io.netty.handler.codec.http.FullHttpResponse - final class WebSocketClientInboundHandler( rtm: NettyRuntime, onResponse: Promise[Throwable, Response], diff --git a/zio-http/src/main/scala/zio/http/netty/model/Conversions.scala b/zio-http/src/main/scala/zio/http/netty/model/Conversions.scala index 950826c3a7..5f3beec7c7 100644 --- a/zio-http/src/main/scala/zio/http/netty/model/Conversions.scala +++ b/zio-http/src/main/scala/zio/http/netty/model/Conversions.scala @@ -18,6 +18,8 @@ package zio.http.netty.model import scala.collection.AbstractIterator +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.Server.Config.CompressionOptions import zio.http._ import zio.http.internal.{CaseMode, CharSequenceExtensions} diff --git a/zio-http/src/main/scala/zio/http/netty/package.scala b/zio-http/src/main/scala/zio/http/netty/package.scala index f5e82d1105..1869f4c5cd 100644 --- a/zio-http/src/main/scala/zio/http/netty/package.scala +++ b/zio-http/src/main/scala/zio/http/netty/package.scala @@ -16,10 +16,10 @@ package zio.http +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.{Trace, ZIO} import io.netty.util.AsciiString - package object netty { private[zio] object Names { diff --git a/zio-http/src/main/scala/zio/http/netty/server/NettyDriver.scala b/zio-http/src/main/scala/zio/http/netty/server/NettyDriver.scala index 16a6203b76..3d5e9ef59d 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/NettyDriver.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/NettyDriver.scala @@ -29,7 +29,6 @@ import zio.http.{ClientDriver, Driver, HttpApp, Server} import io.netty.bootstrap.ServerBootstrap import io.netty.channel._ import io.netty.util.ResourceLeakDetector - private[zio] final case class NettyDriver( appRef: AppRef, channelFactory: ChannelFactory[ServerChannel], diff --git a/zio-http/src/main/scala/zio/http/netty/server/ServerChannelInitializer.scala b/zio-http/src/main/scala/zio/http/netty/server/ServerChannelInitializer.scala index 266372b178..418626c99f 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/ServerChannelInitializer.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/ServerChannelInitializer.scala @@ -19,6 +19,7 @@ package zio.http.netty.server import java.util.concurrent.TimeUnit import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http.Server import zio.http.Server.RequestStreaming diff --git a/zio-http/src/main/scala/zio/http/netty/server/ServerHttpsHandler.scala b/zio-http/src/main/scala/zio/http/netty/server/ServerHttpsHandler.scala index a4e29fdae4..ac2b80f506 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/ServerHttpsHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/ServerHttpsHandler.scala @@ -16,11 +16,12 @@ package zio.http.netty.server +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.SSLConfig.HttpBehaviour import io.netty.channel.{ChannelFutureListener, ChannelHandlerContext, SimpleChannelInboundHandler} import io.netty.handler.codec.http.{DefaultHttpResponse, HttpMessage, HttpResponseStatus, HttpVersion} - private[zio] class ServerHttpsHandler(httpBehaviour: HttpBehaviour) extends SimpleChannelInboundHandler[HttpMessage] { override def channelRead0(ctx: ChannelHandlerContext, msg: HttpMessage): Unit = { diff --git a/zio-http/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala b/zio-http/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala index a8ab82b28a..c6929390ba 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/ServerInboundHandler.scala @@ -24,6 +24,7 @@ import scala.annotation.tailrec import scala.util.control.NonFatal import zio._ +import zio.stacktracer.TracingImplicits.disableAutoTrace import zio.http._ import zio.http.netty._ @@ -35,7 +36,6 @@ import io.netty.channel._ import io.netty.handler.codec.http._ import io.netty.handler.codec.http.websocketx.{WebSocketFrame => JWebSocketFrame, WebSocketServerProtocolHandler} import io.netty.handler.timeout.ReadTimeoutException - @Sharable private[zio] final case class ServerInboundHandler( appRef: AppRef, diff --git a/zio-http/src/main/scala/zio/http/netty/server/ServerSSLDecoder.scala b/zio-http/src/main/scala/zio/http/netty/server/ServerSSLDecoder.scala index db7e27c2ea..9ffeed426d 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/ServerSSLDecoder.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/ServerSSLDecoder.scala @@ -19,6 +19,8 @@ package zio.http.netty.server import java.io.FileInputStream import java.util +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.SSLConfig.{HttpBehaviour, Provider} import zio.http.netty.Names import zio.http.{SSLConfig, Server} @@ -33,7 +35,6 @@ import io.netty.handler.ssl.ApplicationProtocolConfig.{ } import io.netty.handler.ssl.util.SelfSignedCertificate import io.netty.handler.ssl.{SslContext, SslHandler, _} - object SSLUtil { implicit class SslContextBuilderOps(self: SslContextBuilder) { diff --git a/zio-http/src/main/scala/zio/http/netty/server/ServerTime.scala b/zio-http/src/main/scala/zio/http/netty/server/ServerTime.scala index 0d369f187c..85f2da5493 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/ServerTime.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/ServerTime.scala @@ -20,7 +20,7 @@ import io.netty.util.AsciiString import java.text.SimpleDateFormat import java.util.Date // scalafix:ok; - +import zio.stacktracer.TracingImplicits.disableAutoTrace private[zio] final class ServerTime(minDuration: Long) { private var last: Long = System.currentTimeMillis() diff --git a/zio-http/src/main/scala/zio/http/netty/server/package.scala b/zio-http/src/main/scala/zio/http/netty/server/package.scala index 8250b069e9..f288a4a990 100644 --- a/zio-http/src/main/scala/zio/http/netty/server/package.scala +++ b/zio-http/src/main/scala/zio/http/netty/server/package.scala @@ -21,7 +21,7 @@ import zio._ import zio.http._ import java.util.concurrent.atomic.AtomicReference // scalafix:ok; - +import zio.stacktracer.TracingImplicits.disableAutoTrace package object server { private[server] type AppRef = AtomicReference[(HttpApp[Any], ZEnvironment[Any])] private[server] type EnvRef = AtomicReference[ZEnvironment[Any]] diff --git a/zio-http/src/main/scala/zio/http/netty/socket/NettySocketProtocol.scala b/zio-http/src/main/scala/zio/http/netty/socket/NettySocketProtocol.scala index 8e5574b37f..60e58109f1 100644 --- a/zio-http/src/main/scala/zio/http/netty/socket/NettySocketProtocol.scala +++ b/zio-http/src/main/scala/zio/http/netty/socket/NettySocketProtocol.scala @@ -16,6 +16,8 @@ package zio.http.netty.socket +import zio.stacktracer.TracingImplicits.disableAutoTrace + import zio.http.{SocketDecoder, WebSocketConfig} import io.netty.handler.codec.http.websocketx.{ @@ -24,7 +26,6 @@ import io.netty.handler.codec.http.websocketx.{ WebSocketDecoderConfig, WebSocketServerProtocolConfig, } - private[netty] object NettySocketProtocol { def clientBuilder(webSocketConfig: WebSocketConfig): WebSocketClientProtocolConfig.Builder =