PR: comments, logentry

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
microsoft · Mar 15, 2023 · 081c6d9 · 081c6d9
1 parent a59f7a6
commit 081c6d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/internal/gcs/bridge.go b/internal/gcs/bridge.go
@@ -52,9 +52,6 @@ type rpc struct {
 	ch      chan struct{}
 }
 
-// todo(helsaawy): remove bridge.log entry and log based on per-request context, not
-// the context that started the bridge
-
 // bridge represents a communcations bridge with the guest. It handles the
 // transport layer but (mostly) does not parse or construct the message payload.
 type bridge struct {

diff --git a/internal/gcs/protocol.go b/internal/gcs/protocol.go
@@ -136,8 +136,6 @@ func (typ msgType) String() string {
 	return s + ")"
 }
 
-// todo: move this to .\internal\oc and unify with host request?
-
 // ocspancontext is the internal JSON representation of the OpenCensus
 // `trace.SpanContext` for forwarding to a GCS that supports it.
 type ocspancontext struct {

diff --git a/internal/guest/bridge/bridge_v2.go b/internal/guest/bridge/bridge_v2.go
@@ -83,7 +83,7 @@ func (b *Bridge) negotiateProtocolV2(r *Request) (_ RequestResponse, err error)
 // This is allowed only for protocol version 4+, schema version 2.1+
 func (b *Bridge) createContainerV2(r *Request) (_ RequestResponse, err error) {
 	ctx := r.Context
-	log.G(ctx).Trace("opengcs::bridge::createContainerV2")
+	logEntry(ctx, r).Trace("opengcs::bridge::createContainerV2")
 
 	var request prot.ContainerCreate
 	if err := commonutils.UnmarshalJSONWithHresult(r.Message, &request); err != nil {
@@ -417,7 +417,7 @@ func (b *Bridge) resizeConsoleV2(r *Request) (_ RequestResponse, err error) {
 
 func (b *Bridge) modifySettingsV2(r *Request) (_ RequestResponse, err error) {
 	ctx := r.Context
-	log.G(ctx).Trace("opengcs::bridge::modifySettingsV2")
+	logEntry(ctx, r).Trace("opengcs::bridge::modifySettingsV2")
 
 	request, err := prot.UnmarshalContainerModifySettings(r.Message)
 	if err != nil {
@@ -447,7 +447,7 @@ func (b *Bridge) dumpStacksV2(r *Request) (_ RequestResponse, err error) {
 
 func (b *Bridge) deleteContainerStateV2(r *Request) (_ RequestResponse, err error) {
 	ctx := r.Context
-	log.G(ctx).Trace("opengcs::bridge::deleteContainerStateV2")
+	logEntry(ctx, r).Trace("opengcs::bridge::deleteContainerStateV2")
 
 	var request prot.MessageBase
 	if err := commonutils.UnmarshalJSONWithHresult(r.Message, &request); err != nil {