Merge pull request #144 from coreos/remove-analytics

pkg/analytics: Remove Google Analytics tracking

Author: dghubble

cmd/update-operator/main.go

@@ -4,11 +4,11 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"strconv"
 
 	"github.com/coreos/pkg/flagutil"
 	"github.com/golang/glog"
 
-	"github.com/coreos/container-linux-update-operator/pkg/analytics"
 	"github.com/coreos/container-linux-update-operator/pkg/k8sutil"
 	"github.com/coreos/container-linux-update-operator/pkg/operator"
 	"github.com/coreos/container-linux-update-operator/pkg/version"
@@ -18,17 +18,18 @@ var (
 	beforeRebootAnnotations flagutil.StringSliceFlag
 	afterRebootAnnotations  flagutil.StringSliceFlag
 	kubeconfig              = flag.String("kubeconfig", "", "Path to a kubeconfig file. Default to the in-cluster config if not provided.")
-	analyticsEnabled        = flag.Bool("analytics", true, "Send analytics to Google Analytics")
 	autoLabelContainerLinux = flag.Bool("auto-label-container-linux", false, "Auto-label Container Linux nodes with agent=true (convenience)")
 	printVersion            = flag.Bool("version", false, "Print version and exit")
 	// deprecated
-	manageAgent    = flag.Bool("manage-agent", false, "Manage the associated update-agent")
-	agentImageRepo = flag.String("agent-image-repo", "quay.io/coreos/container-linux-update-operator", "The image to use for the managed agent, without version tag")
+	analyticsEnabled optValue
+	manageAgent      = flag.Bool("manage-agent", false, "Manage the associated update-agent")
+	agentImageRepo   = flag.String("agent-image-repo", "quay.io/coreos/container-linux-update-operator", "The image to use for the managed agent, without version tag")
 )
 
 func main() {
 	flag.Var(&beforeRebootAnnotations, "before-reboot-annotations", "List of comma-separated Kubernetes node annotations that must be set to 'true' before a reboot is allowed")
 	flag.Var(&afterRebootAnnotations, "after-reboot-annotations", "List of comma-separated Kubernetes node annotations that must be set to 'true' before a node is marked schedulable and the operator lock is released")
+	flag.Var(&analyticsEnabled, "analytics", "Send analytics to Google Analytics")
 
 	flag.Set("logtostderr", "true")
 	flag.Parse()
@@ -37,6 +38,10 @@ func main() {
 		glog.Fatalf("Failed to parse environment variables: %v", err)
 	}
 
+	if analyticsEnabled.present {
+		glog.Warning("Use of -analytics is deprecated and will be removed. Google Analytics will not be enabled.")
+	}
+
 	// respect KUBECONFIG without the prefix as well
 	if *kubeconfig == "" {
 		*kubeconfig = os.Getenv("KUBECONFIG")
@@ -47,10 +52,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	if *analyticsEnabled {
-		analytics.Enable()
-	}
-
 	if *manageAgent {
 		glog.Warning("Use of -manage-agent=true is deprecated and will be removed in the future")
 	}
@@ -76,8 +77,6 @@ func main() {
 
 	glog.Infof("%s running", os.Args[0])
 
-	analytics.ControllerStarted()
-
 	// Run operator until the stop channel is closed
 	stop := make(chan struct{})
 	defer close(stop)
@@ -86,3 +85,20 @@ func main() {
 		glog.Fatalf("Error while running %s: %v", os.Args[0], err)
 	}
 }
+
+// optValue is a flag.Value that detects whether a user passed a flag directly.
+type optValue struct {
+	value   bool
+	present bool
+}
+
+func (o *optValue) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	o.value = v
+	o.present = true
+	return err
+}
+
+func (o *optValue) String() string {
+	return strconv.FormatBool(o.value)
+}

glide.lock

@@ -57,8 +57,6 @@ import:
   version: bf9dde6d0d2c004a008c27aaee91170c786f6db8
 - package: github.com/imdario/mergo
   version: 6633656539c1639d9d78127b7d47c622b5d7b6dc
-- package: github.com/jpillora/go-ogle-analytics
-  version: 14b04e0594ef6a9fd943363b135656f0ec8c9d0e
 - package: github.com/juju/ratelimit
   version: 5b9ff866471762aa2ab2dced63c9fb6f53921342
 - package: github.com/mailru/easyjson