Reformat and Refactor packages. Rebuild GraphQL.

internal/metricdata/cc-metric-store.go

@@ -75,6 +75,7 @@ type ApiMetricData struct {
 }
 
 func (ccms *CCMetricStore) Init(rawConfig json.RawMessage) error {
+
 	var config CCMetricStoreConfig
 	if err := json.Unmarshal(rawConfig, &config); err != nil {
 		return err
@@ -117,7 +118,10 @@ func (ccms *CCMetricStore) toLocalName(metric string) string {
 	return metric
 }
 
-func (ccms *CCMetricStore) doRequest(ctx context.Context, body *ApiQueryRequest) (*ApiQueryResponse, error) {
+func (ccms *CCMetricStore) doRequest(
+	ctx context.Context,
+	body *ApiQueryRequest) (*ApiQueryResponse, error) {
+
 	buf := &bytes.Buffer{}
 	if err := json.NewEncoder(buf).Encode(body); err != nil {
 		return nil, err
@@ -148,7 +152,12 @@ func (ccms *CCMetricStore) doRequest(ctx context.Context, body *ApiQueryRequest)
 	return &resBody, nil
 }
 
-func (ccms *CCMetricStore) LoadData(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) {
+func (ccms *CCMetricStore) LoadData(
+	job *schema.Job,
+	metrics []string,
+	scopes []schema.MetricScope,
+	ctx context.Context) (schema.JobData, error) {
+
 	topology := archive.GetSubCluster(job.Cluster, job.SubCluster).Topology
 	queries, assignedScope, err := ccms.buildQueries(job, metrics, scopes)
 	if err != nil {
@@ -250,7 +259,11 @@ var (
 	acceleratorString  = string(schema.MetricScopeAccelerator)
 )
 
-func (ccms *CCMetricStore) buildQueries(job *schema.Job, metrics []string, scopes []schema.MetricScope) ([]ApiQuery, []schema.MetricScope, error) {
+func (ccms *CCMetricStore) buildQueries(
+	job *schema.Job,
+	metrics []string,
+	scopes []schema.MetricScope) ([]ApiQuery, []schema.MetricScope, error) {
+
 	queries := make([]ApiQuery, 0, len(metrics)*len(scopes)*len(job.Resources))
 	topology := archive.GetSubCluster(job.Cluster, job.SubCluster).Topology
 	assignedScope := []schema.MetricScope{}
@@ -478,7 +491,11 @@ func (ccms *CCMetricStore) buildQueries(job *schema.Job, metrics []string, scope
 	return queries, assignedScope, nil
 }
 
-func (ccms *CCMetricStore) LoadStats(job *schema.Job, metrics []string, ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
+func (ccms *CCMetricStore) LoadStats(
+	job *schema.Job,
+	metrics []string,
+	ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
+
 	queries, _, err := ccms.buildQueries(job, metrics, []schema.MetricScope{schema.MetricScopeNode})
 	if err != nil {
 		return nil, err
@@ -528,7 +545,13 @@ func (ccms *CCMetricStore) LoadStats(job *schema.Job, metrics []string, ctx cont
 }
 
 // TODO: Support sub-node-scope metrics! For this, the partition of a node needs to be known!
-func (ccms *CCMetricStore) LoadNodeData(cluster string, metrics, nodes []string, scopes []schema.MetricScope, from, to time.Time, ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+func (ccms *CCMetricStore) LoadNodeData(
+	cluster string,
+	metrics, nodes []string,
+	scopes []schema.MetricScope,
+	from, to time.Time,
+	ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+
 	req := ApiQueryRequest{
 		Cluster:   cluster,
 		From:      from.Unix(),
@@ -611,6 +634,7 @@ func (ccms *CCMetricStore) LoadNodeData(cluster string, metrics, nodes []string,
 }
 
 func intToStringSlice(is []int) []string {
+
 	ss := make([]string, len(is))
 	for i, x := range is {
 		ss[i] = strconv.Itoa(x)

internal/metricdata/influxdb-v2.go

@@ -55,7 +55,11 @@ func (idb *InfluxDBv2DataRepository) epochToTime(epoch int64) time.Time {
 	return time.Unix(epoch, 0)
 }
 
-func (idb *InfluxDBv2DataRepository) LoadData(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) {
+func (idb *InfluxDBv2DataRepository) LoadData(
+	job *schema.Job,
+	metrics []string,
+	scopes []schema.MetricScope,
+	ctx context.Context) (schema.JobData, error) {
 
 	measurementsConds := make([]string, 0, len(metrics))
 	for _, m := range metrics {
@@ -234,7 +238,10 @@ func (idb *InfluxDBv2DataRepository) LoadData(job *schema.Job, metrics []string,
 	return jobData, nil
 }
 
-func (idb *InfluxDBv2DataRepository) LoadStats(job *schema.Job, metrics []string, ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
+func (idb *InfluxDBv2DataRepository) LoadStats(
+	job *schema.Job,
+	metrics []string,
+	ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
 
 	stats := map[string]map[string]schema.MetricStatistics{}
 
@@ -304,7 +311,13 @@ func (idb *InfluxDBv2DataRepository) LoadStats(job *schema.Job, metrics []string
 	return stats, nil
 }
 
-func (idb *InfluxDBv2DataRepository) LoadNodeData(cluster string, metrics, nodes []string, scopes []schema.MetricScope, from, to time.Time, ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+func (idb *InfluxDBv2DataRepository) LoadNodeData(
+	cluster string,
+	metrics, nodes []string,
+	scopes []schema.MetricScope,
+	from, to time.Time,
+	ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+
 	// TODO : Implement to be used in Analysis- und System/Node-View
 	log.Println(fmt.Sprintf("LoadNodeData unimplemented for InfluxDBv2DataRepository, Args: cluster %s, metrics %v, nodes %v, scopes %v", cluster, metrics, nodes, scopes))
 

internal/metricdata/metricdata.go

@@ -38,6 +38,7 @@ var metricDataRepos map[string]MetricDataRepository = map[string]MetricDataRepos
 var useArchive bool
 
 func Init(disableArchive bool) error {
+
 	useArchive = !disableArchive
 	for _, cluster := range config.Keys.Clusters {
 		if cluster.MetricDataRepository != nil {
@@ -73,6 +74,7 @@ var cache *lrucache.Cache = lrucache.New(128 * 1024 * 1024)
 
 // Fetches the metric data for a job.
 func LoadData(job *schema.Job,
+
 	metrics []string,
 	scopes []schema.MetricScope,
 	ctx context.Context) (schema.JobData, error) {
@@ -151,7 +153,12 @@ func LoadData(job *schema.Job,
 }
 
 // Used for the jobsFootprint GraphQL-Query. TODO: Rename/Generalize.
-func LoadAverages(job *schema.Job, metrics []string, data [][]schema.Float, ctx context.Context) error {
+func LoadAverages(
+	job *schema.Job,
+	metrics []string,
+	data [][]schema.Float,
+	ctx context.Context) error {
+
 	if job.State != schema.JobStateRunning && useArchive {
 		return archive.LoadAveragesFromArchive(job, metrics, data)
 	}
@@ -184,7 +191,13 @@ func LoadAverages(job *schema.Job, metrics []string, data [][]schema.Float, ctx
 }
 
 // Used for the node/system view. Returns a map of nodes to a map of metrics.
-func LoadNodeData(cluster string, metrics, nodes []string, scopes []schema.MetricScope, from, to time.Time, ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+func LoadNodeData(
+	cluster string,
+	metrics, nodes []string,
+	scopes []schema.MetricScope,
+	from, to time.Time,
+	ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+
 	repo, ok := metricDataRepos[cluster]
 	if !ok {
 		return nil, fmt.Errorf("no metric data repository configured for '%s'", cluster)
@@ -212,17 +225,26 @@ func LoadNodeData(cluster string, metrics, nodes []string, scopes []schema.Metri
 	return data, nil
 }
 
-func cacheKey(job *schema.Job, metrics []string, scopes []schema.MetricScope) string {
+func cacheKey(
+	job *schema.Job,
+	metrics []string,
+	scopes []schema.MetricScope) string {
+
 	// Duration and StartTime do not need to be in the cache key as StartTime is less unique than
 	// job.ID and the TTL of the cache entry makes sure it does not stay there forever.
 	return fmt.Sprintf("%d(%s):[%v],[%v]",
 		job.ID, job.State, metrics, scopes)
 }
 
-// For /monitoring/job/<job> and some other places, flops_any and mem_bw need to be available at the scope 'node'.
-// If a job has a lot of nodes, statisticsSeries should be available so that a min/mean/max Graph can be used instead of
-// a lot of single lines.
-func prepareJobData(job *schema.Job, jobData schema.JobData, scopes []schema.MetricScope) {
+// For /monitoring/job/<job> and some other places, flops_any and mem_bw need
+// to be available at the scope 'node'. If a job has a lot of nodes,
+// statisticsSeries should be available so that a min/mean/max Graph can be
+// used instead of a lot of single lines.
+func prepareJobData(
+	job *schema.Job,
+	jobData schema.JobData,
+	scopes []schema.MetricScope) {
+
 	const maxSeriesSize int = 15
 	for _, scopes := range jobData {
 		for _, jm := range scopes {
@@ -249,6 +271,7 @@ func prepareJobData(job *schema.Job, jobData schema.JobData, scopes []schema.Met
 
 // Writes a running job to the job-archive
 func ArchiveJob(job *schema.Job, ctx context.Context) (*schema.JobMeta, error) {
+
 	allMetrics := make([]string, 0)
 	metricConfigs := archive.GetCluster(job.Cluster).MetricConfig
 	for _, mc := range metricConfigs {

internal/metricdata/utils.go

@@ -23,14 +23,28 @@ func (tmdr *TestMetricDataRepository) Init(_ json.RawMessage) error {
 	return nil
 }
 
-func (tmdr *TestMetricDataRepository) LoadData(job *schema.Job, metrics []string, scopes []schema.MetricScope, ctx context.Context) (schema.JobData, error) {
+func (tmdr *TestMetricDataRepository) LoadData(
+	job *schema.Job,
+	metrics []string,
+	scopes []schema.MetricScope,
+	ctx context.Context) (schema.JobData, error) {
+
 	return TestLoadDataCallback(job, metrics, scopes, ctx)
 }
 
-func (tmdr *TestMetricDataRepository) LoadStats(job *schema.Job, metrics []string, ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
+func (tmdr *TestMetricDataRepository) LoadStats(
+	job *schema.Job,
+	metrics []string, ctx context.Context) (map[string]map[string]schema.MetricStatistics, error) {
+
 	panic("TODO")
 }
 
-func (tmdr *TestMetricDataRepository) LoadNodeData(cluster string, metrics, nodes []string, scopes []schema.MetricScope, from, to time.Time, ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+func (tmdr *TestMetricDataRepository) LoadNodeData(
+	cluster string,
+	metrics, nodes []string,
+	scopes []schema.MetricScope,
+	from, to time.Time,
+	ctx context.Context) (map[string]map[string][]*schema.JobMetric, error) {
+
 	panic("TODO")
 }