From 45ea8def8fd5938791844026752d4b6b8383cd77 Mon Sep 17 00:00:00 2001 From: "Paul \"TBBle\" Hampson" Date: Tue, 13 Jul 2021 16:18:25 +1000 Subject: [PATCH] Fix lost span attribute for NameToGuid "name" is also used for the span title, so this attribute is lost, at least in the textual output. Signed-off-by: Paul "TBBle" Hampson --- internal/wclayer/nametoguid.go | 2 +- .../github.com/Microsoft/hcsshim/internal/wclayer/nametoguid.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/wclayer/nametoguid.go b/internal/wclayer/nametoguid.go index bcf39c6b86..e45f90bb6c 100644 --- a/internal/wclayer/nametoguid.go +++ b/internal/wclayer/nametoguid.go @@ -17,7 +17,7 @@ func NameToGuid(ctx context.Context, name string) (_ guid.GUID, err error) { ctx, span := trace.StartSpan(ctx, title) //nolint:ineffassign,staticcheck defer span.End() defer func() { oc.SetSpanStatus(span, err) }() - span.AddAttributes(trace.StringAttribute("name", name)) + span.AddAttributes(trace.StringAttribute("objectName", name)) var id guid.GUID err = nameToGuid(name, &id) diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/wclayer/nametoguid.go b/test/vendor/github.com/Microsoft/hcsshim/internal/wclayer/nametoguid.go index bcf39c6b86..e45f90bb6c 100644 --- a/test/vendor/github.com/Microsoft/hcsshim/internal/wclayer/nametoguid.go +++ b/test/vendor/github.com/Microsoft/hcsshim/internal/wclayer/nametoguid.go @@ -17,7 +17,7 @@ func NameToGuid(ctx context.Context, name string) (_ guid.GUID, err error) { ctx, span := trace.StartSpan(ctx, title) //nolint:ineffassign,staticcheck defer span.End() defer func() { oc.SetSpanStatus(span, err) }() - span.AddAttributes(trace.StringAttribute("name", name)) + span.AddAttributes(trace.StringAttribute("objectName", name)) var id guid.GUID err = nameToGuid(name, &id)