HTTP Grafana

abn/service.go

@@ -24,8 +24,11 @@ import (
 )
 
 const (
-	// metricsDirEnv is the environment variable identifying the directory with metrics storage
-	metricsDirEnv = "METRICS_DIR"
+	// MetricsDirEnv is the environment variable identifying the directory with metrics storage
+	MetricsDirEnv = "METRICS_DIR"
+
+	configEnv         = "ABN_CONFIG_FILE"
+	defaultPortNumber = 50051
 )
 
 var (
@@ -85,11 +88,6 @@ func (server *abnServer) WriteMetric(ctx context.Context, metricMsg *pb.MetricVa
 		)
 }
 
-const (
-	configEnv         = "ABN_CONFIG_FILE"
-	defaultPortNumber = 50051
-)
-
 // abnConfig defines the configuration of the controllers
 type abnConfig struct {
 	// Port is port number on which the abn gRPC service should listen
@@ -119,8 +117,8 @@ func LaunchGRPCServer(opts []grpc.ServerOption, stopCh <-chan struct{}) error {
 	grpcServer := grpc.NewServer(opts...)
 	pb.RegisterABNServer(grpcServer, newServer())
 
-	// configure metricsClient if needed
-	MetricsClient, err = badgerdb.GetClient(badger.DefaultOptions(os.Getenv(metricsDirEnv)), badgerdb.AdditionalOptions{})
+	// configure MetricsClient if needed
+	MetricsClient, err = badgerdb.GetClient(badger.DefaultOptions(os.Getenv(MetricsDirEnv)), badgerdb.AdditionalOptions{})
 	if err != nil {
 		log.Logger.Error("Unable to configure metrics storage client ", err)
 		return err

abn/service_impl.go

@@ -47,6 +47,9 @@ func lookupInternal(application string, user string) (controllers.RoutemapInterf
 	}
 
 	// record user; ignore error if any; this is best effort
+	if MetricsClient == nil {
+		return nil, invalidVersion, fmt.Errorf("no metrics client")
+	}
 	_ = MetricsClient.SetUser(application, versionNumber, *s.GetVersions()[versionNumber].GetSignature(), user)
 
 	return s, versionNumber, nil
@@ -131,6 +134,9 @@ func writeMetricInternal(application, user, metric, valueStr string) error {
 	v := s.GetVersions()[versionNumber]
 	transaction := uuid.NewString()
 
+	if MetricsClient == nil {
+		return fmt.Errorf("no metrics client")
+	}
 	err = MetricsClient.SetMetric(
 		s.GetNamespace()+"/"+s.GetName(), versionNumber, *v.GetSignature(),
 		metric, user, transaction,

abn/service_test.go

@@ -212,16 +212,24 @@ func getMetricsCount(t *testing.T, namespace string, name string, version int, m
 	if rm == nil || reflect.ValueOf(rm).IsNil() {
 		return 0
 	}
+
 	assert.Less(t, version, len(rm.GetVersions()))
 	v := rm.GetVersions()[version]
 	signature := v.GetSignature()
+
 	if nil == signature {
 		return 0
 	}
+
+	// TODO: better error handling when there is no metrics client
+	if MetricsClient == nil {
+		return 0
+	}
 	versionmetrics, err := MetricsClient.GetMetrics(namespace+"/"+name, version, *signature)
 	if err != nil {
 		return 0
 	}
+
 	metrics, ok := (*versionmetrics)[metric]
 	if !ok {
 		return 0
@@ -236,7 +244,7 @@ func TestLaunchGRPCServer(t *testing.T) {
 	defer cancel()
 
 	// define METRICS_DIR
-	err := os.Setenv(metricsDirEnv, t.TempDir())
+	err := os.Setenv(MetricsDirEnv, t.TempDir())
 	assert.NoError(t, err)
 
 	configFile := filepath.Clean(util.CompletePath("../testdata", "abninputs/config.yaml"))

action/run.go

@@ -32,5 +32,6 @@ func (rOpts *RunOpts) KubeRun() error {
 	if err := rOpts.KubeDriver.InitKube(); err != nil {
 		return err
 	}
+
 	return base.RunExperiment(rOpts.ReuseResult, rOpts.KubeDriver)
 }

base/collect_grpc.go

@@ -96,7 +96,7 @@ func (t *collectGRPCTask) resultForVersion() (map[string]*runner.Report, error)
 
 			// merge endpoint options with baseline options
 			if err := mergo.Merge(&endpoint, t.With.Config); err != nil {
-				log.Logger.Error(fmt.Sprintf("could not merge Fortio options for endpoint \"%s\"", endpointID))
+				log.Logger.Error(fmt.Sprintf("could not merge ghz options for endpoint \"%s\"", endpointID))
 				return nil, err
 			}
 			eOpts := runner.WithConfig(&endpoint) // endpoint options