test that otel metrics are created

Author: IsaacPD

go.mod

@@ -68,9 +68,10 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/tektoncd/pipeline v0.5.1-0.20190731183258-9d7e37e85bf8
 	github.com/xeipuuv/gojsonschema v1.2.0
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
 	go.opentelemetry.io/otel v0.13.0
+	go.opentelemetry.io/otel/exporters/stdout v0.13.0
 	go.opentelemetry.io/otel/sdk v0.13.0
+	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
 	golang.org/x/mod v0.3.0
 	golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb // indirect
 	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58

go.sum

@@ -1274,10 +1274,19 @@ go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA=
 go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY=
 go.opentelemetry.io/otel v0.14.0 h1:YFBEfjCk9MTjaytCNSUkp9Q8lF7QJezA06T71FbQxLQ=
 go.opentelemetry.io/otel v0.14.0/go.mod h1:vH5xEuwy7Rts0GNtsCW3HYQoZDY+OmBJ6t1bFGGlxgw=
+go.opentelemetry.io/otel v0.15.0 h1:CZFy2lPhxd4HlhZnYK8gRyDotksO3Ip9rBweY1vVYJw=
+go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA=
+go.opentelemetry.io/otel/exporters/stdout v0.13.0 h1:A+XiGIPQbGoJoBOJfKAKnZyiUSjSWvL3XWETUvtom5k=
+go.opentelemetry.io/otel/exporters/stdout v0.13.0/go.mod h1:JJt8RpNY6K+ft9ir3iKpceCvT/rhzJXEExGrWFCbv1o=
+go.opentelemetry.io/otel/exporters/stdout v0.14.0/go.mod h1:KG9w470+KbZZexYbC/g3TPKgluS0VgBJHh4KlnJpG18=
+go.opentelemetry.io/otel/exporters/stdout v0.15.0 h1:/i7NvRnB+L7R/uxwpfolovicyBFnFa527NBs2yIhPUo=
+go.opentelemetry.io/otel/exporters/stdout v0.15.0/go.mod h1:1d+FA51tyW9NDD0VXUsk5K5S3LAOt9GBWU3TNelHhxA=
 go.opentelemetry.io/otel/sdk v0.13.0 h1:4VCfpKamZ8GtnepXxMRurSpHpMKkcxhtO33z1S4rGDQ=
 go.opentelemetry.io/otel/sdk v0.13.0/go.mod h1:dKvLH8Uu8LcEPlSAUsfW7kMGaJBhk/1NYvpPZ6wIMbU=
 go.opentelemetry.io/otel/sdk v0.14.0 h1:Pqgd85y5XhyvHQlOxkKW+FD4DAX7AoeaNIDKC2VhfHQ=
 go.opentelemetry.io/otel/sdk v0.14.0/go.mod h1:kGO5pEMSNqSJppHAm8b73zztLxB5fgDQnD56/dl5xqE=
+go.opentelemetry.io/otel/sdk v0.15.0 h1:Hf2dl1Ad9Hn03qjcAuAq51GP5Pv1SV5puIkS2nRhdd8=
+go.opentelemetry.io/otel/sdk v0.15.0/go.mod h1:Qudkwgq81OcA9GYVlbyZ62wkLieeS1eWxIL0ufxgwoc=
 go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=

pkg/skaffold/instrumentation/meter.go

@@ -71,8 +71,8 @@ type skaffoldMeter struct {
 }
 
 type devIteration struct {
-	intent    string
-	errorCode proto.StatusCode
+	Intent    string
+	ErrorCode proto.StatusCode
 }
 
 var (
@@ -92,6 +92,7 @@ var (
 	meteredCommands     = util.NewStringSet()
 	doesBuild           = util.NewStringSet()
 	doesDeploy          = util.NewStringSet()
+	initExporter        = initCloudMonitoringExporterMetrics
 	isOnline            bool
 )
 
@@ -113,11 +114,7 @@ func init() {
 func InitMeterFromConfig(config *latest.SkaffoldConfig) {
 	meter.PlatformType = yamltags.GetYamlTag(config.Build.BuildType)
 	for _, artifact := range config.Pipeline.Build.Artifacts {
-		if _, ok := meter.Builders[yamltags.GetYamlTag(artifact.ArtifactType)]; ok {
-			meter.Builders[yamltags.GetYamlTag(artifact.ArtifactType)]++
-		} else {
-			meter.Builders[yamltags.GetYamlTag(artifact.ArtifactType)] = 1
-		}
+		meter.Builders[yamltags.GetYamlTag(artifact.ArtifactType)]++
 		if artifact.Sync != nil {
 			meter.SyncType[yamltags.GetYamlTag(artifact.Sync)] = true
 		}
@@ -137,14 +134,14 @@ func SetErrorCode(errorCode proto.StatusCode) {
 }
 
 func AddDevIteration(intent string) {
-	meter.DevIterations = append(meter.DevIterations, devIteration{intent: intent})
+	meter.DevIterations = append(meter.DevIterations, devIteration{Intent: intent})
 }
 
 func AddDevIterationErr(i int, errorCode proto.StatusCode) {
 	if len(meter.DevIterations) == i {
-		meter.DevIterations = append(meter.DevIterations, devIteration{intent: "error"})
+		meter.DevIterations = append(meter.DevIterations, devIteration{Intent: "error"})
 	}
-	meter.DevIterations[i].errorCode = errorCode
+	meter.DevIterations[i].ErrorCode = errorCode
 }
 
 func AddFlag(flag *flag.Flag) {
@@ -170,7 +167,7 @@ func ExportMetrics(exitCode int) error {
 
 func exportMetrics(ctx context.Context, filename string, meter skaffoldMeter) error {
 	logrus.Debug("exporting metrics")
-	p, err := initCloudMonitoringExporterMetrics()
+	p, err := initExporter()
 	if p == nil {
 		return err
 	}
@@ -297,14 +294,14 @@ func commandMetrics(ctx context.Context, meter skaffoldMeter, m metric.Meter, ra
 		counts := make(map[string]map[proto.StatusCode]int)
 
 		for _, iteration := range meter.DevIterations {
-			if _, ok := counts[iteration.intent]; !ok {
-				counts[iteration.intent] = make(map[proto.StatusCode]int)
+			if _, ok := counts[iteration.Intent]; !ok {
+				counts[iteration.Intent] = make(map[proto.StatusCode]int)
 			}
-			m := counts[iteration.intent]
-			if _, ok := m[iteration.errorCode]; !ok {
-				m[iteration.errorCode] = 0
+			m := counts[iteration.Intent]
+			if _, ok := m[iteration.ErrorCode]; !ok {
+				m[iteration.ErrorCode] = 0
 			}
-			m[iteration.errorCode]++
+			m[iteration.ErrorCode]++
 		}
 		for intention, errorCounts := range counts {
 			for errorCode, count := range errorCounts {