diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-14 05:17:38 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-14 05:17:38 -0700 |
commit | f2f0de430d7545d19ef9505d7f6d8ef46a0d36b9 (patch) | |
tree | 0e5a15f979b88eb2e05adb7ac0967dbfcaa7a459 /vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go | |
parent | 150679d7b10ad56b7f41d22810eb2c421edf9da5 (diff) | |
parent | 1f0cc866d4707c75116d210dc781534c9d7f62fd (diff) | |
download | podman-f2f0de430d7545d19ef9505d7f6d8ef46a0d36b9.tar.gz podman-f2f0de430d7545d19ef9505d7f6d8ef46a0d36b9.tar.bz2 podman-f2f0de430d7545d19ef9505d7f6d8ef46a0d36b9.zip |
Merge pull request #6204 from containers/dependabot/go_modules/github.com/containers/storage-1.19.2
Bump github.com/containers/storage from 1.19.1 to 1.19.2
Diffstat (limited to 'vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go')
-rw-r--r-- | vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go b/vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go index dcb919268..81e454956 100644 --- a/vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go +++ b/vendor/github.com/Microsoft/hcsshim/internal/wclayer/activatelayer.go @@ -1,28 +1,23 @@ package wclayer import ( + "context" + "github.com/Microsoft/hcsshim/internal/hcserror" - "github.com/sirupsen/logrus" + "github.com/Microsoft/hcsshim/internal/oc" + "go.opencensus.io/trace" ) // ActivateLayer will find the layer with the given id and mount it's filesystem. // For a read/write layer, the mounted filesystem will appear as a volume on the // host, while a read-only layer is generally expected to be a no-op. // An activated layer must later be deactivated via DeactivateLayer. -func ActivateLayer(path string) (err error) { +func ActivateLayer(ctx context.Context, path string) (err error) { title := "hcsshim::ActivateLayer" - fields := logrus.Fields{ - "path": path, - } - logrus.WithFields(fields).Debug(title) - defer func() { - if err != nil { - fields[logrus.ErrorKey] = err - logrus.WithFields(fields).Error(err) - } else { - logrus.WithFields(fields).Debug(title + " - succeeded") - } - }() + ctx, span := trace.StartSpan(ctx, title) + defer span.End() + defer func() { oc.SetSpanStatus(span, err) }() + span.AddAttributes(trace.StringAttribute("path", path)) err = activateLayer(&stdDriverInfo, path) if err != nil { |