fix parseBenchmarkName (#26)

prefixes were not trimmed correctly

Signed-off-by: lwsanty <lwsanty@gmail.com>

Author: lwsanty

cmd/bblfsh-performance/driver/driver.go

@@ -12,14 +12,12 @@ import (
 	"github.com/bblfsh/performance/storage"
 	"github.com/bblfsh/performance/storage/file"
 	"github.com/bblfsh/performance/storage/influxdb"
-	prom "github.com/bblfsh/performance/storage/prom-pushgateway"
+	"github.com/bblfsh/performance/storage/pushgateway"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/src-d/go-log.v1"
 )
 
-const fileFilterPrefix = performance.FileFilterPrefix
-
 // Cmd return configured driver-native command
 func Cmd() *cobra.Command {
 	cmd := &cobra.Command{
@@ -107,8 +105,8 @@ export INFLUX_MEASUREMENT=benchmark
 	flags.StringP("language", "l", "", "name of the language to be tested")
 	flags.StringP("commit", "c", "", "commit id that's being tested and will be used as a tag in performance report")
 	flags.StringSlice("exclude-suffixes", []string{".legacy", ".native", ".uast"}, "file suffixes to be excluded")
-	flags.String("filter-prefix", fileFilterPrefix, "file prefix to be filtered")
-	flags.StringP("storage", "s", prom.Kind, fmt.Sprintf("storage kind to store the results(%s, %s, %s)", prom.Kind, influxdb.Kind, file.Kind))
+	flags.String("filter-prefix", performance.FileFilterPrefix, "file prefix to be filtered")
+	flags.StringP("storage", "s", pushgateway.Kind, fmt.Sprintf("storage kind to store the results(%s, %s, %s)", pushgateway.Kind, influxdb.Kind, file.Kind))
 
 	return cmd
 }

cmd/bblfsh-performance/drivernative/drivernative.go

@@ -13,14 +13,13 @@ import (
 	"github.com/bblfsh/performance/storage"
 	"github.com/bblfsh/performance/storage/file"
 	"github.com/bblfsh/performance/storage/influxdb"
-	prom_pushgateway "github.com/bblfsh/performance/storage/prom-pushgateway"
+	"github.com/bblfsh/performance/storage/pushgateway"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/src-d/go-log.v1"
 )
 
 const (
-	fileFilterPrefix  = performance.FileFilterPrefix
 	containerTmp      = "/tmp"
 	containerFixtures = containerTmp + "/fixtures"
 	results           = "results.txt"
@@ -156,8 +155,8 @@ export INFLUX_MEASUREMENT=benchmark
 	flags.StringP("language", "l", "", "name of the language to be tested")
 	flags.StringP("commit", "c", "", "commit id that's being tested and will be used as a tag in performance report")
 	flags.StringSlice("exclude-suffixes", []string{".legacy", ".native", ".uast"}, "file suffixes to be excluded")
-	flags.String("filter-prefix", fileFilterPrefix, "file prefix to be filtered")
-	flags.StringP("storage", "s", prom_pushgateway.Kind, fmt.Sprintf("storage kind to store the results(%s, %s, %s)", prom_pushgateway.Kind, influxdb.Kind, file.Kind))
+	flags.String("filter-prefix", performance.FileFilterPrefix, "file prefix to be filtered")
+	flags.StringP("storage", "s", pushgateway.Kind, fmt.Sprintf("storage kind to store the results(%s, %s, %s)", pushgateway.Kind, influxdb.Kind, file.Kind))
 
 	return cmd
 }

cmd/bblfsh-performance/endtoend/endtoend.go

@@ -12,17 +12,13 @@ import (
 	"github.com/bblfsh/performance/storage"
 	"github.com/bblfsh/performance/storage/file"
 	"github.com/bblfsh/performance/storage/influxdb"
-	prom_pushgateway "github.com/bblfsh/performance/storage/prom-pushgateway"
+	"github.com/bblfsh/performance/storage/pushgateway"
 
 	"github.com/spf13/cobra"
 	"gopkg.in/src-d/go-log.v1"
 )
 
-const (
-	fileFilterPrefix = performance.FileFilterPrefix
-
-	bblfshDefaultConfTag = "latest-drivers"
-)
+const bblfshDefaultConfTag = "latest-drivers"
 
 // TODO(lwsanty): https://github.com/bblfsh/performance/issues/2
 // Cmd return configured end to end command
@@ -128,9 +124,9 @@ export INFLUX_MEASUREMENT=benchmark
 	flags.StringP("commit", "c", "", "commit id that's being tested and will be used as a tag in performance report")
 	flags.StringSlice("exclude-suffixes", []string{".legacy", ".native", ".uast"}, "file suffixes to be excluded")
 	flags.StringP("docker-tag", "t", bblfshDefaultConfTag, "bblfshd docker image tag to be tested")
-	flags.String("filter-prefix", fileFilterPrefix, "file prefix to be filtered")
-	flags.StringP("storage", "s", prom_pushgateway.Kind, "storage kind to store the results"+
-		fmt.Sprintf("(%s, %s, %s)", prom_pushgateway.Kind, influxdb.Kind, file.Kind))
+	flags.String("filter-prefix", performance.FileFilterPrefix, "file prefix to be filtered")
+	flags.StringP("storage", "s", pushgateway.Kind, "storage kind to store the results"+
+		fmt.Sprintf("(%s, %s, %s)", pushgateway.Kind, influxdb.Kind, file.Kind))
 	flags.Bool("custom-driver", false, "if this flag is set to true CLI pulls corresponding language driver repo's commit, builds docker image and installs it onto the bblfsh container")
 
 	return cmd

cmd/bblfsh-performance/main.go

@@ -10,7 +10,7 @@ import (
 	"github.com/bblfsh/performance/cmd/bblfsh-performance/parseandstore"
 	_ "github.com/bblfsh/performance/storage/file"
 	_ "github.com/bblfsh/performance/storage/influxdb"
-	_ "github.com/bblfsh/performance/storage/prom-pushgateway"
+	_ "github.com/bblfsh/performance/storage/pushgateway"
 
 	"github.com/spf13/cobra"
 )

cmd/bblfsh-performance/parseandstore/parseandstore.go

@@ -8,8 +8,8 @@ import (
 	"github.com/bblfsh/performance/storage"
 	"github.com/bblfsh/performance/storage/file"
 	"github.com/bblfsh/performance/storage/influxdb"
-	"github.com/bblfsh/performance/storage/prom-pushgateway"
 
+	"github.com/bblfsh/performance/storage/pushgateway"
 	"github.com/spf13/cobra"
 	"golang.org/x/tools/benchmark/parse"
 )
@@ -39,6 +39,7 @@ bblfsh-performance parse-and-store --language=go --commit=3d9682b --storage="inf
 		RunE: performance.RunESilenced(func(cmd *cobra.Command, args []string) error {
 			language, _ := cmd.Flags().GetString("language")
 			commit, _ := cmd.Flags().GetString("commit")
+			filterPrefix, _ := cmd.Flags().GetString("filter-prefix")
 			stor, _ := cmd.Flags().GetString("storage")
 
 			c, err := storage.NewClient(stor)
@@ -49,7 +50,7 @@ bblfsh-performance parse-and-store --language=go --commit=3d9682b --storage="inf
 
 			// TODO(lwsanty): parallelize
 			for _, p := range args {
-				benchmarks, err := getBenchmarks(p)
+				benchmarks, err := getBenchmarks(p, filterPrefix)
 				if err != nil {
 					return err
 				}
@@ -70,13 +71,14 @@ bblfsh-performance parse-and-store --language=go --commit=3d9682b --storage="inf
 	flags := cmd.Flags()
 	flags.StringP("language", "l", "", "name of the language to be tested")
 	flags.StringP("commit", "c", "", "commit id that's being tested and will be used as a tag in performance report")
-	flags.StringP("storage", "s", prom_pushgateway.Kind, "storage kind to store the results"+
-		fmt.Sprintf("(%s, %s, %s)", prom_pushgateway.Kind, influxdb.Kind, file.Kind))
+	flags.String("filter-prefix", performance.FileFilterPrefix, "file prefix to be filtered")
+	flags.StringP("storage", "s", pushgateway.Kind, "storage kind to store the results"+
+		fmt.Sprintf("(%s, %s, %s)", pushgateway.Kind, influxdb.Kind, file.Kind))
 
 	return cmd
 }
 
-func getBenchmarks(path string) ([]performance.Benchmark, error) {
+func getBenchmarks(path string, trimPrefixes ...string) ([]performance.Benchmark, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return nil, err
@@ -91,7 +93,7 @@ func getBenchmarks(path string) ([]performance.Benchmark, error) {
 	for _, s := range set {
 		var benchmarkSet []performance.Benchmark
 		for _, b := range s {
-			benchmarkSet = append(benchmarkSet, performance.NewBenchmark(b))
+			benchmarkSet = append(benchmarkSet, performance.NewBenchmark(b, trimPrefixes...))
 		}
 		result = append(result, benchmarkSet...)
 	}

cmd/native-driver-performance/main.go

@@ -23,7 +23,7 @@ func main() {
 	// TODO: fixtures filters and so on
 	fixtures := flag.String("fixtures", "", "path to fixtures directory")
 	resultsFile := flag.String("results", "", "path to file to store benchmark results")
-	filterPrefix := flag.String("filter-prefix", "", "file prefix to be filtered")
+	filterPrefix := flag.String("filter-prefix", performance.FileFilterPrefix, "file prefix to be filtered")
 
 	flag.Parse()
 

common.go

@@ -62,18 +62,24 @@ func BenchmarkResultToBenchmark(name string, b *testing.BenchmarkResult, trimPre
 }
 
 // parseBenchmarkName removes the path and suffixes from benchmark info
-// Example: BenchmarkGoDriver/transform/accumulator_factory-4 -> accumulator_factory
+// Example1: BenchmarkGoDriver/transform/accumulator_factory-4 -> accumulator_factory
+// Example2: BenchmarkGoDriver/transform/bench_accumulator_factory-4 -> accumulator_factory, where "bench_" is a trimPrefixes
 func parseBenchmarkName(name string, trimPrefixes ...string) string {
-	for _, tp := range trimPrefixes {
-		name = strings.TrimPrefix(name, tp)
+	trim := func(name string) (res string) {
+		for _, tp := range trimPrefixes {
+			if strings.HasPrefix(name, tp) {
+				return strings.TrimPrefix(name, tp)
+			}
+		}
+		return name
 	}
 	if i := strings.LastIndex(name, "/"); i >= 0 {
 		name = name[i+1:]
 	}
 	if i := strings.IndexAny(name, "-."); i >= 0 {
-		return name[:i]
+		return trim(name[:i])
 	}
-	return name
+	return trim(name)
 }
 
 // TODO(lwsanty): https://github.com/spf13/cobra/issues/340

storage/prom-pushgateway/pushgateway.go storage/pushgateway/pushgateway.gostorage/prom-pushgateway/pushgateway.go renamed to storage/pushgateway/pushgateway.go

@@ -1,4 +1,4 @@
-package prom_pushgateway
+package pushgateway
 
 import (
 	"time"