oasis-test-runner: move TestInstanceInfo to Env

go/oasis-net-runner/cmd/root.go

@@ -110,7 +110,7 @@ func runRoot(cmd *cobra.Command, args []string) error {
 	defer rootEnv.Cleanup()
 	logger := logging.GetLogger("net-runner")
 
-	childEnv, err := rootEnv.NewChild("net-runner")
+	childEnv, err := rootEnv.NewChild("net-runner", env.TestInstanceInfo{})
 	if err != nil {
 		logger.Error("failed to setup child environment",
 			"err", err,

go/oasis-test-runner/cmd/root.go

@@ -2,10 +2,8 @@
 package cmd
 
 import (
-	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -200,25 +198,6 @@ func computeParamSets(zp map[string][]string, ps map[string]string) []map[string
 	return rps
 }
 
-// writeParamSetToFile dumps test instance parameter set to test_instance_info.json file for debugging afterwards.
-func writeTestInstanceInfo(dirName string, s scenario.Scenario, run int) error {
-	testInfo := scenario.TestInstanceInfo{
-		Name:         s.Name(),
-		ParameterSet: scenario.ParametersToStringMap(s.Parameters()),
-		Run:          run,
-	}
-
-	b, err := json.Marshal(testInfo)
-	if err != nil {
-		return err
-	}
-	if err = ioutil.WriteFile(dirName+"/test_instance_info.json", b, 0644); err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // Register adds a scenario to the runner and the default scenarios list.
 func Register(scenario scenario.Scenario) error {
 	if err := RegisterNondefault(scenario); err != nil {
@@ -347,7 +326,12 @@ func runRoot(cmd *cobra.Command, args []string) error {
 					"test", n,
 				)
 
-				childEnv, err := rootEnv.NewChild(n)
+				childEnv, err := rootEnv.NewChild(n, env.TestInstanceInfo{
+					Name:         v.Name(),
+					Instance:     filepath.Base(rootEnv.Dir()),
+					ParameterSet: scenario.ParametersToStringMap(v.Parameters()),
+					Run:          run,
+				})
 				if err != nil {
 					logger.Error("failed to setup child environment",
 						"err", err,
@@ -357,7 +341,7 @@ func runRoot(cmd *cobra.Command, args []string) error {
 				}
 
 				// Dump current parameter set to file.
-				if err = writeTestInstanceInfo(childEnv.Dir(), v, run); err != nil {
+				if err = childEnv.WriteTestInstanceInfo(); err != nil {
 					return err
 				}
 

go/oasis-test-runner/env/env.go

@@ -3,7 +3,9 @@ package env
 
 import (
 	"container/list"
+	"encoding/json"
 	"errors"
+	"io/ioutil"
 	"os/exec"
 	"sync"
 	"syscall"
@@ -17,6 +19,21 @@ var ErrEarlyTerm = errors.New("env: sub-process exited early")
 // CleanupFn is the cleanup hook function prototype.
 type CleanupFn func()
 
+// TestInstanceInfo contains information of the current test run.
+type TestInstanceInfo struct {
+	// Name is the name of the test.
+	Name string `json:"name"`
+
+	// Instance is the instance name of the test. e.g. oasis-test-runner123456
+	Instance string `json:"instance"`
+
+	// ParameterSet is the paramater set the test was run with.
+	ParameterSet map[string]string `json:"parameter_set"`
+
+	// Run is the number of run.
+	Run int `json:"run"`
+}
+
 // Env is a (nested) test environment.
 type Env struct {
 	name string
@@ -26,6 +43,7 @@ type Env struct {
 	children   *list.List
 
 	dir         *Dir
+	testInfo    TestInstanceInfo
 	cleanupFns  []CleanupFn
 	cleanupCmds []*cmdMonitor
 	cleanupLock sync.Mutex
@@ -53,6 +71,11 @@ func (env *Env) NewSubDir(subDirName string) (*Dir, error) {
 	return env.dir.NewSubDir(subDirName)
 }
 
+// TestInfo returns the test instance information.
+func (env *Env) TestInfo() TestInstanceInfo {
+	return env.testInfo
+}
+
 // AddOnCleanup adds a cleanup routine to be called durring the environment's
 // cleanup.  Routines will be called in reverse order that they were
 // registered.
@@ -130,7 +153,7 @@ func (env *Env) Cleanup() {
 }
 
 // NewChild returns a new child test environment.
-func (env *Env) NewChild(childName string) (*Env, error) {
+func (env *Env) NewChild(childName string, testInfo TestInstanceInfo) (*Env, error) {
 	var parentDir *Dir
 	if env.parent != nil {
 		parentDir = env.parent.dir
@@ -148,12 +171,26 @@ func (env *Env) NewChild(childName string) (*Env, error) {
 		parent:   env,
 		children: list.New(),
 		dir:      subDir,
+		testInfo: testInfo,
 	}
 	child.parentElem = env.children.PushBack(child)
 
 	return child, nil
 }
 
+// WriteParamSetToFile dumps test instance parameter set to test_instance_info.json file for debugging afterwards.
+func (env *Env) WriteTestInstanceInfo() error {
+	b, err := json.Marshal(env.testInfo)
+	if err != nil {
+		return err
+	}
+	if err = ioutil.WriteFile(env.Dir()+"/test_instance_info.json", b, 0644); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // New creates a new root test environment.
 func New(dir *Dir) *Env {
 	return &Env{

go/oasis-test-runner/oasis/args.go

@@ -414,16 +414,16 @@ func (args *argBuilder) appendNodeMetrics(node *Node) *argBuilder {
 		"--" + metrics.CfgMetricsAddr, viper.GetString(metrics.CfgMetricsAddr),
 		"--" + metrics.CfgMetricsPushInterval, viper.GetString(metrics.CfgMetricsPushInterval),
 		// TODO Matevz: Should job_name also be moved as a simple label?
-		"--" + metrics.CfgMetricsPushJobName, filepath.Base(node.dir.String())}...)
+		"--" + metrics.CfgMetricsPushJobName, node.Name}...)
 
 	// Append labels.
 	args.vec = append(args.vec, "--"+metrics.CfgMetricsPushLabels)
 
 	// TODO Matevz: Populate with test-parameters, startdate, git_branch?
-	dirs := strings.Split(node.dir.String(), "/")
-	l := []string{"instance=" + dirs[len(dirs)-4],
-		"run=" + dirs[len(dirs)-3],
-		"test=" + dirs[len(dirs)-4], // TODO: What if test name contains / like "gas-fees/runtimes"?
+	ti := node.net.env.TestInfo()
+	l := []string{"instance=" + ti.Instance,
+		"run=" + strconv.Itoa(ti.Run),
+		"test=" + ti.Name, // TODO: Escape slashes, for e.g. "gas-fees/runtimes".
 		"software_version=" + version.SoftwareVersion}
 
 	args.vec = append(args.vec, strings.Join(l, ","))

go/oasis-test-runner/scenario/scenario.go

@@ -8,18 +8,6 @@ import (
 	"github.com/oasislabs/oasis-core/go/oasis-test-runner/oasis"
 )
 
-// TestInstanceInfo contains information of the current test run.
-type TestInstanceInfo struct {
-	// Name is the name of the test.
-	Name string `json:"name"`
-
-	// ParameterSet is the paramater set the test was run with.
-	ParameterSet map[string]string `json:"parameter_set"`
-
-	// Run is the number of run.
-	Run int `json:"run"`
-}
-
 // ParametersToStringMap convert scenario-specific key->value parameter set to string->string map.
 func ParametersToStringMap(p map[string]interface{}) map[string]string {
 	sMap := make(map[string]string)