move profiling to main method

Author: nkubala

cmd/analyze.go

@@ -25,7 +25,6 @@ import (
 	"github.com/GoogleCloudPlatform/container-diff/differs"
 	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
 	"github.com/golang/glog"
-	"github.com/pkg/profile"
 	"github.com/spf13/cobra"
 )
 
@@ -43,9 +42,6 @@ var analyzeCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		if os.Getenv(containerDiffEnvPrefix) == "1" {
-			defer profile.Start(profile.TraceProfile).Stop()
-		}
 		if err := analyzeImage(args[0], strings.Split(types, ",")); err != nil {
 			glog.Error(err)
 			os.Exit(1)

cmd/diff.go

@@ -26,7 +26,6 @@ import (
 	"github.com/GoogleCloudPlatform/container-diff/differs"
 	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
 	"github.com/golang/glog"
-	"github.com/pkg/profile"
 	"github.com/spf13/cobra"
 )
 
@@ -44,9 +43,6 @@ var diffCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		if os.Getenv(containerDiffEnvPrefix) == "1" {
-			defer profile.Start(profile.TraceProfile).Stop()
-		}
 		if err := diffImages(args[0], args[1], strings.Split(types, ",")); err != nil {
 			glog.Error(err)
 			os.Exit(1)

cmd/root.go

@@ -41,8 +41,6 @@ type validatefxn func(args []string) error
 const (
 	DaemonPrefix = "daemon://"
 	RemotePrefix = "remote://"
-
-	containerDiffEnvPrefix = "CONTAINER_DIFF_ENABLE_PROFILING"
 )
 
 var RootCmd = &cobra.Command{

main.go

@@ -23,10 +23,16 @@ import (
 
 	"github.com/GoogleCloudPlatform/container-diff/cmd"
 	"github.com/golang/glog"
+	"github.com/pkg/profile"
 )
 
+const containerDiffEnvPrefix = "CONTAINER_DIFF_ENABLE_PROFILING"
+
 func main() {
 	flag.Parse()
+	if os.Getenv(containerDiffEnvPrefix) == "1" {
+		defer profile.Start(profile.TraceProfile).Stop()
+	}
 	if err := cmd.RootCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)