network-mux: removed handshake traces

Author: coot

network-mux/CHANGELOG.md

@@ -8,6 +8,7 @@
 * Polling of the egress queue
 * run, miniProtocolJob, monitor now accept MuxTracerBundle record
   instead of `Tracer m Trace` type.
+* Removed handshake trace events from mux trace.
 
 ### Non-breaking changes
 * Define msHeaderLength instead of using '8'

network-mux/src/Network/Mux/Trace.hs

@@ -146,12 +146,6 @@ data Trace =
     | TraceSDUReadTimeoutException
     | TraceSDUWriteTimeoutException
     | TraceTCPInfo StructTCPInfo Word16
-    -- low level handshake bearer tags (not traced by tracer in Mux)
-    | TraceHandshakeStart
-    | TraceHandshakeClientEnd DiffTime
-    | TraceHandshakeServerEnd
-    | forall e. Exception e => TraceHandshakeClientError e DiffTime
-    | forall e. Exception e => TraceHandshakeServerError e
     -- mid level channel tags traced independently by each mini protocol
     -- job in Mux, for each complete message, by the 'channelTracer'
     -- within 'MuxTracerBundle'
@@ -198,13 +192,6 @@ instance Show Trace where
     show (TraceChannelSendStart mid len) = printf "Channel Send Start on (%s) %d" (show mid)
         len
     show (TraceChannelSendEnd mid) = printf "Channel Send End on %s" (show mid)
-    show TraceHandshakeStart = "Handshake start"
-    show (TraceHandshakeClientEnd duration) = printf "Handshake Client end, duration %s" (show duration)
-    show TraceHandshakeServerEnd = "Handshake Server end"
-    show (TraceHandshakeClientError e duration) =
-         -- Client Error can include an error string from the peer which could be very large.
-        printf "Handshake Client Error %s duration %s" (take 256 $ show e) (show duration)
-    show (TraceHandshakeServerError e) = printf "Handshake Server Error %s" (show e)
     show TraceSDUReadTimeoutException = "Timed out reading SDU"
     show TraceSDUWriteTimeoutException = "Timed out writing SDU"
     show (TraceStartEagerly mid dir) = printf "Eagerly started (%s) in %s" (show mid) (show dir)

ouroboros-network-framework/src/Ouroboros/Network/Socket.hs

@@ -377,7 +377,6 @@ connectToNodeWithMux'
     connectionId <- (\localAddress remoteAddress -> ConnectionId { localAddress, remoteAddress })
                 <$> Snocket.getLocalAddr sn sd <*> Snocket.getRemoteAddr sn sd
     muxTracer <- initDeltaQTracer' $ Mx.WithBearer connectionId `contramap` nctMuxTracer
-    ts_start <- getMonotonicTime
 
     handshakeBearer <- Mx.getBearer makeBearer sduHandshakeTimeout muxTracer sd Nothing
     app_e <-
@@ -394,18 +393,14 @@ connectToNodeWithMux'
           haTimeLimits       = handshakeTimeLimits
         }
         versions
-    ts_end <- getMonotonicTime
     case app_e of
        Left (HandshakeProtocolLimit err) -> do
-         traceWith muxTracer $ Mx.TraceHandshakeClientError err (diffTime ts_end ts_start)
          throwIO err
 
        Left (HandshakeProtocolError err) -> do
-         traceWith muxTracer $ Mx.TraceHandshakeClientError err (diffTime ts_end ts_start)
          throwIO err
 
        Right (HandshakeNegotiationResult app versionNumber agreedOptions) -> do
-         traceWith muxTracer $ Mx.TraceHandshakeClientEnd (diffTime ts_end ts_start)
          Mx.withReadBufferIO (\buffer -> do
              bearer <- Mx.getBearer makeBearer sduTimeout muxTracer sd buffer
              mux <- Mx.new (toMiniProtocolInfos (runForkPolicy noBindForkPolicy remoteAddress) app)
@@ -414,7 +409,6 @@ connectToNodeWithMux'
            )
 
        Right (HandshakeQueryResult _vMap) -> do
-         traceWith muxTracer $ Mx.TraceHandshakeClientEnd (diffTime ts_end ts_start)
          throwIO (QueryNotSupported @vNumber)