@@ -42,7 +42,7 @@ import (
4242
4343 "github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/cmd/statik"
4444
45- // import embedded secret for uploading metrics
45+ // import embedded secret for uploading metrics
4646 _ "github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/secret/statik"
4747 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/constants"
4848 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
@@ -61,7 +61,7 @@ type skaffoldMeter struct {
6161 Arch string
6262 PlatformType string
6363 Deployers []string
64- EnumFlags map [string ]* flag. Flag
64+ EnumFlags map [string ]string
6565 Builders map [string ]int
6666 SyncType map [string ]bool
6767 DevIterations []devIteration
@@ -71,15 +71,15 @@ type skaffoldMeter struct {
7171}
7272
7373type devIteration struct {
74- intent string
75- errorCode proto.StatusCode
74+ Intent string
75+ ErrorCode proto.StatusCode
7676}
7777
7878var (
7979 meter = skaffoldMeter {
8080 OS : runtime .GOOS ,
8181 Arch : runtime .GOARCH ,
82- EnumFlags : map [string ]* flag. Flag {},
82+ EnumFlags : map [string ]string {},
8383 Builders : map [string ]int {},
8484 SyncType : map [string ]bool {},
8585 DevIterations : []devIteration {},
9292 meteredCommands = util .NewStringSet ()
9393 doesBuild = util .NewStringSet ()
9494 doesDeploy = util .NewStringSet ()
95+ initExporter = initCloudMonitoringExporterMetrics
9596 isOnline bool
9697)
9798
@@ -113,11 +114,7 @@ func init() {
113114func InitMeterFromConfig (config * latest.SkaffoldConfig ) {
114115 meter .PlatformType = yamltags .GetYamlTag (config .Build .BuildType )
115116 for _ , artifact := range config .Pipeline .Build .Artifacts {
116- if _ , ok := meter .Builders [yamltags .GetYamlTag (artifact .ArtifactType )]; ok {
117- meter .Builders [yamltags .GetYamlTag (artifact .ArtifactType )]++
118- } else {
119- meter .Builders [yamltags .GetYamlTag (artifact .ArtifactType )] = 1
120- }
117+ meter .Builders [yamltags .GetYamlTag (artifact .ArtifactType )]++
121118 if artifact .Sync != nil {
122119 meter .SyncType [yamltags .GetYamlTag (artifact .Sync )] = true
123120 }
@@ -137,18 +134,20 @@ func SetErrorCode(errorCode proto.StatusCode) {
137134}
138135
139136func AddDevIteration (intent string ) {
140- meter .DevIterations = append (meter .DevIterations , devIteration {intent : intent })
137+ meter .DevIterations = append (meter .DevIterations , devIteration {Intent : intent })
141138}
142139
143140func AddDevIterationErr (i int , errorCode proto.StatusCode ) {
144141 if len (meter .DevIterations ) == i {
145- meter .DevIterations = append (meter .DevIterations , devIteration {intent : "error" })
142+ meter .DevIterations = append (meter .DevIterations , devIteration {Intent : "error" })
146143 }
147- meter .DevIterations [i ].errorCode = errorCode
144+ meter .DevIterations [i ].ErrorCode = errorCode
148145}
149146
150147func AddFlag (flag * flag.Flag ) {
151- meter .EnumFlags [flag .Name ] = flag
148+ if flag .Changed {
149+ meter .EnumFlags [flag .Name ] = flag .Value .String ()
150+ }
152151}
153152
154153func ExportMetrics (exitCode int ) error {
@@ -168,7 +167,7 @@ func ExportMetrics(exitCode int) error {
168167
169168func exportMetrics (ctx context.Context , filename string , meter skaffoldMeter ) error {
170169 logrus .Debug ("exporting metrics" )
171- p , err := initCloudMonitoringExporterMetrics ()
170+ p , err := initExporter ()
172171 if p == nil {
173172 return err
174173 }
@@ -189,11 +188,13 @@ func exportMetrics(ctx context.Context, filename string, meter skaffoldMeter) er
189188 return ioutil .WriteFile (filename , b , 0666 )
190189 }
191190
191+ start := time .Now ()
192192 p .Start ()
193193 for _ , m := range meters {
194194 createMetrics (ctx , m )
195195 }
196196 p .Stop ()
197+ logrus .Debugf ("metrics uploading complete in %s" , time .Since (start ).String ())
197198
198199 if fileExists {
199200 return os .Remove (filename )
@@ -221,8 +222,8 @@ func initCloudMonitoringExporterMetrics() (*push.Controller, error) {
221222
222223 var c creds
223224 err = json .Unmarshal (b , & c )
224- if err != nil {
225- return nil , fmt .Errorf ("error unmarsharling metrics credentials: %v" , err )
225+ if c . ProjectID == "" || err != nil {
226+ return nil , fmt .Errorf ("no project id found in metrics credentials" )
226227 }
227228
228229 formatter := func (desc * metric.Descriptor ) string {
@@ -295,14 +296,11 @@ func commandMetrics(ctx context.Context, meter skaffoldMeter, m metric.Meter, ra
295296 counts := make (map [string ]map [proto.StatusCode ]int )
296297
297298 for _ , iteration := range meter .DevIterations {
298- if _ , ok := counts [iteration .intent ]; ! ok {
299- counts [iteration .intent ] = make (map [proto.StatusCode ]int )
300- }
301- m := counts [iteration .intent ]
302- if _ , ok := m [iteration .errorCode ]; ! ok {
303- m [iteration .errorCode ] = 0
299+ if _ , ok := counts [iteration .Intent ]; ! ok {
300+ counts [iteration .Intent ] = make (map [proto.StatusCode ]int )
304301 }
305- m [iteration .errorCode ]++
302+ m := counts [iteration .Intent ]
303+ m [iteration .ErrorCode ]++
306304 }
307305 for intention , errorCounts := range counts {
308306 for errorCode , count := range errorCounts {
0 commit comments