Migrate fuzzer to use shiny new metrics2 package

fuzzer/go/fuzzer-be/main.go

 package main
 
 /*
 Runs the backend portions of the fuzzer.  This includes the generator and aggregator parts (see DESIGN.md)
 */
 
 import (
         "flag"
         "fmt"
         "os"
         "path/filepath"
         "time"
 
         "github.com/skia-dev/glog"
         "go.skia.org/infra/fuzzer/go/aggregator"
         "go.skia.org/infra/fuzzer/go/backend"
         fcommon "go.skia.org/infra/fuzzer/go/common"
         "go.skia.org/infra/fuzzer/go/config"
         "go.skia.org/infra/fuzzer/go/generator"
         "go.skia.org/infra/go/auth"
         "go.skia.org/infra/go/common"
         "go.skia.org/infra/go/fileutil"
+        "go.skia.org/infra/go/influxdb"
         "golang.org/x/net/context"
         "google.golang.org/cloud"
         "google.golang.org/cloud/storage"
 )
 
 var (
         aflOutputPath      = flag.String("afl_output_path", "", "[REQUIRED] The output folder of afl-fuzz.  This will have on folder for each fuzz_to_run.  Each of those will have N folders named fuzzer0 - fuzzerN.  Should not be in /tmp or afl-fuzz will refuse to run.")
         generatorWD        = flag.String("generator_working_dir", "", "[REQUIRED] The generator's working directory.  Should not be in /tmp.")
         fuzzSamples        = flag.String("fuzz_samples", "", "[REQUIRED] The generator's working directory.  Should not be in /tmp.")
         skiaRoot           = flag.String("skia_root", "", "[REQUIRED] The root directory of the Skia source code.")
         clangPath          = flag.String("clang_path", "", "[REQUIRED] The path to the clang executable.")
         clangPlusPlusPath  = flag.String("clang_p_p_path", "", "[REQUIRED] The path to the clang++ executable.")
         depotToolsPath     = flag.String("depot_tools_path", "", "The absolute path to depot_tools.  Can be empty if they are on your path.")
         aflRoot            = flag.String("afl_root", "", "[REQUIRED] The install directory of afl-fuzz (v1.94b or later).")
         numFuzzProcesses   = flag.Int("fuzz_processes", 0, `The number of processes to run afl-fuzz [per fuzz to run].  This should be fewer than the number of logical cores.  Defaults to 0, which means "Make an intelligent guess"`)
         versionCheckPeriod = flag.Duration("version_check_period", 20*time.Second, `The period used to check the version of Skia that needs fuzzing.`)
         downloadProcesses  = flag.Int("download_processes", 4, "The number of download processes to be used for fetching fuzzes when re-analyzing them. This is constant with respect to the number of fuzzes.")
         fuzzesToRun        = common.NewMultiStringFlag("fuzz_to_run", nil, fmt.Sprintf("A set of fuzzes to run.  Can be one or more of the known fuzzes: %q", fcommon.FUZZ_CATEGORIES))
 
         bucket               = flag.String("bucket", "skia-fuzzer", "The GCS bucket in which to store found fuzzes.")
         fuzzPath             = flag.String("fuzz_path", filepath.Join(os.TempDir(), "fuzzes"), "The directory to temporarily store the binary fuzzes during aggregation.")
         executablePath       = flag.String("executable_path", filepath.Join(os.TempDir(), "executables"), "The directory to store temporary executables that will run the fuzzes during aggregation. Defaults to /tmp/executables.")
         numAnalysisProcesses = flag.Int("analysis_processes", 0, `The number of processes to analyze fuzzes [per fuzz to run].  This should be fewer than the number of logical cores.  Defaults to 0, which means "Make an intelligent guess"`)
         rescanPeriod         = flag.Duration("rescan_period", 60*time.Second, `The time in which to sleep for every cycle of aggregation. `)
         numUploadProcesses   = flag.Int("upload_processes", 0, `The number of processes to upload fuzzes [per fuzz to run]. Defaults to 0, which means "Make an intelligent guess"`)
         statusPeriod         = flag.Duration("status_period", 60*time.Second, `The time period used to report the status of the aggregation/analysis/upload queue. `)
         analysisTimeout      = flag.Duration("analysis_timeout", 5*time.Second, `The maximum time an analysis should run.`)
 
-        graphiteServer = flag.String("graphite_server", "localhost:2003", "Where is Graphite metrics ingestion server running.")
+        influxHost     = flag.String("influxdb_host", influxdb.DEFAULT_HOST, "The InfluxDB hostname.")
+        influxUser     = flag.String("influxdb_name", influxdb.DEFAULT_USER, "The InfluxDB username.")
+        influxPassword = flag.String("influxdb_password", influxdb.DEFAULT_PASSWORD, "The InfluxDB password.")
+        influxDatabase = flag.String("influxdb_database", influxdb.DEFAULT_DATABASE, "The InfluxDB database.")
 
         watchAFL        = flag.Bool("watch_afl", false, "(debug only) If the afl master's output should be piped to stdout.")
         skipGeneration  = flag.Bool("skip_generation", false, "(debug only) If the generation step should be disabled.")
-        forceReanalysis = flag.Bool("force_reanalysis", false, "(debug only) If the fuzzes should be downloaded, re-analyzed, (deleted for GCS), and reuploaded.")
+        forceReanalysis = flag.Bool("force_reanalysis", false, "(debug only) If the fuzzes should be downloaded, re-analyzed, (deleted from GCS), and reuploaded.")
         verboseBuilds   = flag.Bool("verbose_builds", false, "If output from ninja and gyp should be printed to stdout.")
+        local           = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
 )
 
 var (
         requiredFlags                 = []string{"afl_output_path", "skia_root", "clang_path", "clang_p_p_path", "afl_root", "generator_working_dir", "fuzz_to_run"}
         storageClient *storage.Client = nil
 )
 
 func main() {
         defer common.LogPanic()
         // Calls flag.Parse()
-        common.InitWithMetrics("fuzzer-be", graphiteServer)
+        common.InitWithMetrics2("fuzzer-be", influxHost, influxUser, influxPassword, influxDatabase, local)
 
         if err := writeFlagsToConfig(); err != nil {
                 glog.Fatalf("Problem with configuration: %v", err)
         }
         if err := setupOAuth(); err != nil {
                 glog.Fatalf("Problem with OAuth: %s", err)
         }
         if err := fcommon.DownloadSkiaVersionForFuzzing(storageClient, config.Generator.SkiaRoot, &config.Generator); err != nil {
                 glog.Fatalf("Problem downloading Skia: %s", err)
         }
 
         fuzzPipelines := make([]backend.FuzzPipeline, 0, len(*fuzzesToRun))
 
         for _, category := range *fuzzesToRun {
                 gen := generator.New(category)
                 if err := gen.DownloadSeedFiles(storageClient); err != nil {
                         glog.Fatalf("Problem downloading binary seed files: %s", err)
                 }
 
                 // If we are reanalyzing, no point in running the generator first, just to stop it.
-                if !*skipGeneration && !*forceReanalysis {
+                if !*forceReanalysis {

[borenet, 2016/02/11 12:23:28]

Not sure if you meant to remove skipGeneration here.

[kjlubick, 2016/02/11 17:54:41]

It'll be fine.  The very next CL will add the other logic back in.

                         glog.Infof("Starting %s generator with configuration %#v", category, config.Generator)
                         if err := gen.Start(); err != nil {
                                 glog.Fatalf("Problem starting binary generator: %s", err)
                         }
                 } else {
                         glog.Infof("Skipping %s generator because --skip_generation is enabled", category)
                 }
 
                 glog.Infof("Starting %s aggregator with configuration %#v", category, config.Aggregator)
                 agg, err := aggregator.StartAggregator(storageClient, category)
@@ skipping 83 matching lines @@
         client, err := auth.NewDefaultJWTServiceAccountClient(auth.SCOPE_READ_WRITE)
         if err != nil {
                 return fmt.Errorf("Problem setting up client OAuth: %v", err)
         }
 
         if storageClient, err = storage.NewClient(context.Background(), cloud.WithBaseHTTP(client)); err != nil {
                 return fmt.Errorf("Problem authenticating: %v", err)
         }
         return nil
 }