cloud metadata: fix overwriting labels with empty values

coroot · Apr 6, 2023 · 8840fd9 · 8840fd9
1 parent 2163f5f
commit 8840fd9
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/node/collector.go b/node/collector.go
@@ -236,20 +236,20 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 	if c.instanceMetadata != nil {
 		im = *c.instanceMetadata
 	}
-	if flags.Provider != nil {
-		im.Provider = metadata.CloudProvider(flags.GetString(flags.Provider))
+	if f := flags.GetString(flags.Provider); f != "" {
+		im.Provider = metadata.CloudProvider(f)
 	}
-	if flags.Region != nil {
-		im.Region = flags.GetString(flags.Region)
+	if f := flags.GetString(flags.Region); f != "" {
+		im.Region = f
 	}
-	if flags.AvailabilityZone != nil {
-		im.AvailabilityZone = flags.GetString(flags.AvailabilityZone)
+	if f := flags.GetString(flags.AvailabilityZone); f != "" {
+		im.AvailabilityZone = f
 	}
-	if flags.InstanceType != nil {
-		im.InstanceType = flags.GetString(flags.InstanceType)
+	if f := flags.GetString(flags.InstanceType); f != "" {
+		im.InstanceType = f
 	}
-	if flags.InstanceLifeCycle != nil {
-		im.LifeCycle = flags.GetString(flags.InstanceLifeCycle)
+	if f := flags.GetString(flags.InstanceLifeCycle); f != "" {
+		im.LifeCycle = f
 	}
 	ch <- gauge(cloudInfoDesc, 1,
 		string(im.Provider), im.AccountId, im.InstanceId, im.InstanceType, im.LifeCycle,