turn hidden --trace into a NOP

The --trace has helped in early stages analyze Podman code.  However,
it's contributing to dependency and binary bloat.  The standard go
tooling can also help in profiling, so let's turn `--trace` into a NOP.

[NO TESTS NEEDED]

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

2 files changed, 0 insertions, 28 deletions

diff --git a/libpod/image/image.go b/libpod/image/image.go
index 8bbf555e3..12dc22360 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -38,7 +38,6 @@ import (
 	"github.com/containers/storage"
 	digest "github.com/opencontainers/go-digest"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -144,10 +143,6 @@ func (ir *Runtime) NewFromLocal(name string) (*Image, error) {
 // New creates a new image object where the image could be local
 // or remote
 func (ir *Runtime) New(ctx context.Context, name, signaturePolicyPath, authfile string, writer io.Writer, dockeroptions *DockerRegistryOptions, signingoptions SigningOptions, label *string, pullType util.PullType, progress chan types.ProgressProperties) (*Image, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "newImage")
-	span.SetTag("type", "runtime")
-	defer span.Finish()
-
 	// We don't know if the image is local or not ... check local first
 	if pullType != util.PullImageAlways {
 		newImage, err := ir.NewFromLocal(name)
@@ -1297,21 +1292,11 @@ func (i *Image) inspect(ctx context.Context, calculateSize bool) (*inspect.Image
 
 // Inspect returns an image's inspect data
 func (i *Image) Inspect(ctx context.Context) (*inspect.ImageData, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "imageInspect")
-
-	span.SetTag("type", "image")
-	defer span.Finish()
-
 	return i.inspect(ctx, true)
 }
 
 // InspectNoSize returns an image's inspect data without calculating the size for the image
 func (i *Image) InspectNoSize(ctx context.Context) (*inspect.ImageData, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "imageInspectNoSize")
-
-	span.SetTag("type", "image")
-	defer span.Finish()
-
 	return i.inspect(ctx, false)
 }
 
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index c5fafc25d..58160b52f 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -23,7 +23,6 @@ import (
 	"github.com/containers/podman/v3/libpod/events"
 	"github.com/containers/podman/v3/pkg/errorhandling"
 	"github.com/containers/podman/v3/pkg/registries"
-	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
@@ -172,9 +171,6 @@ func (ir *Runtime) getPullRefPairsFromDockerArchiveReference(ctx context.Context
 // pullGoalFromImageReference returns a pull goal for a single ImageReference, depending on the used transport.
 // Note that callers are responsible for invoking (*pullGoal).cleanUp() to clean up possibly open resources.
 func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types.ImageReference, imgName string, sc *types.SystemContext) (*pullGoal, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "pullGoalFromImageReference")
-	defer span.Finish()
-
 	// supports pulling from docker-archive, oci, and registries
 	switch srcRef.Transport().Name() {
 	case DockerArchive:
@@ -243,9 +239,6 @@ func toLocalImageName(imageName string) string {
 // pullImageFromHeuristicSource pulls an image based on inputName, which is heuristically parsed and may involve configured registries.
 // Use pullImageFromReference if the source is known precisely.
 func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName string, writer io.Writer, authfile, signaturePolicyPath string, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, retryOptions *retry.RetryOptions, label *string, progress chan types.ProgressProperties) ([]string, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "pullImageFromHeuristicSource")
-	defer span.Finish()
-
 	var goal *pullGoal
 	sc := GetSystemContext(signaturePolicyPath, authfile, false)
 	if dockerOptions != nil {
@@ -281,9 +274,6 @@ func (ir *Runtime) pullImageFromHeuristicSource(ctx context.Context, inputName s
 
 // pullImageFromReference pulls an image from a types.imageReference.
 func (ir *Runtime) pullImageFromReference(ctx context.Context, srcRef types.ImageReference, writer io.Writer, authfile, signaturePolicyPath string, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, retryOptions *retry.RetryOptions) ([]string, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "pullImageFromReference")
-	defer span.Finish()
-
 	sc := GetSystemContext(signaturePolicyPath, authfile, false)
 	if dockerOptions != nil {
 		sc.OSChoice = dockerOptions.OSChoice
@@ -306,9 +296,6 @@ func cleanErrorMessage(err error) string {
 
 // doPullImage is an internal helper interpreting pullGoal. Almost everyone should call one of the callers of doPullImage instead.
 func (ir *Runtime) doPullImage(ctx context.Context, sc *types.SystemContext, goal pullGoal, writer io.Writer, signingOptions SigningOptions, dockerOptions *DockerRegistryOptions, retryOptions *retry.RetryOptions, label *string, progress chan types.ProgressProperties) ([]string, error) {
-	span, _ := opentracing.StartSpanFromContext(ctx, "doPullImage")
-	defer span.Finish()
-
 	policyContext, err := getPolicyContext(sc)
 	if err != nil {
 		return nil, err