Moved vpc lookup cache miss to be before potential errors

bigkraig · bigkraig · commit 6ca302caeadc · 2018-06-27T15:57:42.000-07:00
diff --git a/pkg/aws/albec2/ec2.go b/pkg/aws/albec2/ec2.go
@@ -622,6 +622,8 @@ func (e *EC2) GetVPCID() (*string, error) {
 		return vpc, nil
 	}
 
+	albprom.AWSCache.With(prometheus.Labels{"cache": "vpc", "action": "miss"}).Add(float64(1))
+
 	// cache miss: begin lookup of VpcId based on current EC2 instance
 	// retrieve identity of current running instance
 	identityDoc, err := EC2Metadatasvc.GetInstanceIdentityDocument()
@@ -651,7 +653,6 @@ func (e *EC2) GetVPCID() (*string, error) {
 	vpc = descInstancesOutput.Reservations[0].Instances[0].VpcId
 	// cache the retrieved VpcId for next call
 	e.cache.Set(key, vpc, time.Minute*60)
-	albprom.AWSCache.With(prometheus.Labels{"cache": "vpc", "action": "miss"}).Add(float64(1))
 	return vpc, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -622,6 +622,8 @@ func (e EC2) GetVPCID() (string, error) {`
`622`	`622`	`return vpc, nil`
`623`	`623`	`}`
`624`	`624`
	`625`	`+ albprom.AWSCache.With(prometheus.Labels{"cache": "vpc", "action": "miss"}).Add(float64(1))`
	`626`	`+`
`625`	`627`	`// cache miss: begin lookup of VpcId based on current EC2 instance`
`626`	`628`	`// retrieve identity of current running instance`
`627`	`629`	`identityDoc, err := EC2Metadatasvc.GetInstanceIdentityDocument()`
`@@ -651,7 +653,6 @@ func (e EC2) GetVPCID() (string, error) {`
`651`	`653`	`vpc = descInstancesOutput.Reservations[0].Instances[0].VpcId`
`652`	`654`	`// cache the retrieved VpcId for next call`
`653`	`655`	`e.cache.Set(key, vpc, time.Minute*60)`
`654`		`- albprom.AWSCache.With(prometheus.Labels{"cache": "vpc", "action": "miss"}).Add(float64(1))`
`655`	`656`	`return vpc, nil`
`656`	`657`	`}`
`657`	`658`