From 6dcbdfaf58745b37bb21dc42f1ca86b6c6975b0d Mon Sep 17 00:00:00 2001
From: gmarek <gmarek@google.com>
Date: Thu, 11 May 2017 13:05:53 +0200
Subject: [PATCH] Print API latency metrics as perfdata

---
 test/e2e/framework/metrics_util.go | 14 +++++++-------
 test/e2e/framework/perf_util.go    |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/e2e/framework/metrics_util.go b/test/e2e/framework/metrics_util.go
index fa11cb7764..729c4a97a8 100644
--- a/test/e2e/framework/metrics_util.go
+++ b/test/e2e/framework/metrics_util.go
@@ -103,7 +103,7 @@ func (m *MetricsForE2E) PrintHumanReadable() string {
 
 func (m *MetricsForE2E) PrintJSON() string {
 	m.filterMetrics()
-	return PrettyPrintJSON(*m)
+	return PrettyPrintJSON(m)
 }
 
 func (m *MetricsForE2E) SummaryKind() string {
@@ -155,11 +155,11 @@ func (l *PodStartupLatency) SummaryKind() string {
 }
 
 func (l *PodStartupLatency) PrintHumanReadable() string {
-	return PrettyPrintJSON(*l)
+	return PrettyPrintJSON(l)
 }
 
 func (l *PodStartupLatency) PrintJSON() string {
-	return PrettyPrintJSON(*l)
+	return PrettyPrintJSON(l)
 }
 
 type SchedulingLatency struct {
@@ -173,11 +173,11 @@ func (l *SchedulingLatency) SummaryKind() string {
 }
 
 func (l *SchedulingLatency) PrintHumanReadable() string {
-	return PrettyPrintJSON(*l)
+	return PrettyPrintJSON(l)
 }
 
 func (l *SchedulingLatency) PrintJSON() string {
-	return PrettyPrintJSON(*l)
+	return PrettyPrintJSON(l)
 }
 
 type SaturationTime struct {
@@ -203,11 +203,11 @@ func (a *APIResponsiveness) SummaryKind() string {
 }
 
 func (a *APIResponsiveness) PrintHumanReadable() string {
-	return PrettyPrintJSON(*a)
+	return PrettyPrintJSON(a)
 }
 
 func (a *APIResponsiveness) PrintJSON() string {
-	return PrettyPrintJSON(*a)
+	return PrettyPrintJSON(ApiCallToPerfData(a))
 }
 
 func (a *APIResponsiveness) Len() int { return len(a.APICalls) }
diff --git a/test/e2e/framework/perf_util.go b/test/e2e/framework/perf_util.go
index 99ef385e6d..0afd9066ea 100644
--- a/test/e2e/framework/perf_util.go
+++ b/test/e2e/framework/perf_util.go
@@ -30,7 +30,7 @@ import (
 const currentApiCallMetricsVersion = "v1"
 
 // ApiCallToPerfData transforms APIResponsiveness to PerfData.
-func ApiCallToPerfData(apicalls APIResponsiveness) *perftype.PerfData {
+func ApiCallToPerfData(apicalls *APIResponsiveness) *perftype.PerfData {
 	perfData := &perftype.PerfData{Version: currentApiCallMetricsVersion}
 	for _, apicall := range apicalls.APICalls {
 		item := perftype.DataItem{
@@ -43,6 +43,7 @@ func ApiCallToPerfData(apicalls APIResponsiveness) *perftype.PerfData {
 			Labels: map[string]string{
 				"Verb":     apicall.Verb,
 				"Resource": apicall.Resource,
+				"Count":    fmt.Sprintf("%v", apicall.Count),
 			},
 		}
 		perfData.DataItems = append(perfData.DataItems, item)