Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add additional logging to track mesh clients interacting with Namerd #2277

Closed
wants to merge 7 commits into from
Closed

Add additional logging to track mesh clients interacting with Namerd #2277

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ec9aec1
add trace logging for Linkerd's mesh client
May 22, 2019
ca8d07d
fix issue in H2 NettyWriter to actually log frame info
May 23, 2019
f4946bc
add client id to mesh interpreter in Linkerd
May 23, 2019
c60346b
log incoming namerd mesh requests
May 23, 2019
bee6dbb
add additional logging for k8s events
May 23, 2019
44cf2f1
add H2HeaderInjector
May 23, 2019
6082418
refactor logging mechanism in linkerd mesh client
May 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
add trace logging for Linkerd's mesh client 
Signed-off-by: Dennis Adjei-Baah <[email protected]>
  • Loading branch information
Dennis Adjei-Baah committed May 23, 2019
commit ec9aec1328760018b29d902d1873d7127c3f4037
26 changes: 23 additions & 3 deletions interpreter/mesh/src/main/scala/io/buoyant/interpreter/mesh/Client.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.buoyant.interpreter.mesh

import com.twitter.finagle._
import com.twitter.finagle.{Addr, _}
import com.twitter.finagle.buoyant.h2
import com.twitter.finagle.buoyant.h2.Reset
import com.twitter.finagle.http.{MediaType, Request, Response}
Expand All @@ -14,6 +14,7 @@ import io.buoyant.namer.{DelegateTree, Delegator, InstrumentedActivity, Instrume
import io.linkerd.mesh
import io.linkerd.mesh.Converters._
import java.net.{InetAddress, InetSocketAddress}
import com.twitter.logging.Logger
import scala.util.control.{NoStackTrace, NonFatal}

object Client {
Expand Down Expand Up @@ -54,6 +55,8 @@ object Client {
timer: Timer
) extends NameInterpreter with Delegator with Admin.WithHandlers {

val log = Logger(this.getClass.getName)

private case class InstrumentedBind(
act: InstrumentedActivity[NameTree[Name.Bound]],
stream: StreamState[mesh.BindReq, mesh.BoundTreeRsp]
Expand Down Expand Up @@ -91,6 +94,7 @@ object Client {
val streamState = new StreamState[mesh.BindReq, mesh.BoundTreeRsp]
val open = () => {
val req = mkBindReq(root, path, dtab)
log.trace(s"Mesh bind request: Root: ${root.show}, Path: ${path.show}, Dtab: ${dtab.show}")
streamState.recordApiCall(req)
interpreter.streamBoundTree(req)
}
Expand All @@ -112,10 +116,17 @@ object Client {
val streamState = new StreamState[mesh.DtabReq, mesh.DtabRsp]
val open = () => {
val req = mkDtabReq(root)
log.trace(s"Mesh dtab request: Path: ${root.show}")
streamState.recordApiCall(req)
delegator.streamDtab(req)
}
streamActivity(open, decodeDtab, backoffs, timer, streamState).underlying
val dtabVar = streamActivity(open, decodeDtab, backoffs, timer, streamState).underlying
dtabVar.states.respond {
case Activity.Pending => log.trace(s"Dtab stream initialized for root: ${root.show}")
case Activity.Failed(cause) => log.trace(s"Dtab stream failed for root ${root.show}: ${cause.getMessage}")
case Activity.Ok(d) => log.trace(s"Dtab stream for root ${root.show}: ${d.show}")
}
dtabVar
}
}
}
Expand All @@ -125,6 +136,7 @@ object Client {
tree: NameTree[Name.Path]
): Future[DelegateTree[Name.Bound]] = {
val req = mkDelegateTreeReq(root, dtab, tree)
log.trace(s"Mesh delegate request: Root: ${root.show} Dtab: ${dtab.show}")
delegator.getDelegateTree(req).flatMap { delegateTree =>
decodeDelegateTree(delegateTree) match {
case Some(decoded) => Future.value(decoded)
Expand All @@ -143,12 +155,20 @@ object Client {
val streamState = new StreamState[mesh.ReplicasReq, mesh.Replicas]
val open = () => {
val req = mkReplicasReq(id)
log.trace(s"Mesh replicas request: client name: ${id.show}")
streamState.recordApiCall(req)
resolver.streamReplicas(req)
}
val resolution = streamVar(Addr.Pending, open, replicasToAddr, backoffs, timer, streamState)
resolveCache += (id -> InstrumentedResolve(resolution, streamState))
resolution.underlying
val underlyingVar = resolution.underlying
underlyingVar.changes.respond {
case Addr.Pending => log.trace(s"Pending addresses for client: ${id.show}")
case Addr.Failed(cause) => log.trace(s"Failed to receive address set for client ${id.show}: ${cause.getMessage}")
case Addr.Neg => log.trace(s"empty address set for client ${id.show}")
case Addr.Bound(addrs, _) => log.trace(s"Received addresses for client ${id.show}: ${addrs.mkString(",")}")
}
underlyingVar
}
}
}
Expand Down