yet another fix to TestMaxRunDurationHook_EmitMetrics

Author: pkazmierczak

client/allocrunner/max_run_duration_hook_test.go

@@ -4,6 +4,7 @@
 package allocrunner
 
 import (
+	"strings"
 	"testing"
 	"time"
 
@@ -287,24 +288,28 @@ func TestMaxRunDurationHook_EmitMetrics(t *testing.T) {
 	err = hook.Prerun((*taskenv.TaskEnv)(nil))
 	must.NoError(t, err)
 
-	var metricKeySuffix string
-	for _, label := range baseLabels {
-		metricKeySuffix += ";" + label.Name + "=" + label.Value
-	}
-	metricKeySuffix += ";task_group=" + alloc.TaskGroup
-
-	configuredName := "nomad_test.client.allocs.max_run_duration.configured_seconds" + metricKeySuffix
-	remainingName := "nomad_test.client.allocs.max_run_duration.remaining_seconds" + metricKeySuffix
-
 	data := inMemorySink.Data()
 	must.Len(t, 1, data)
-	must.MapContainsKey(t, data[0].Gauges, configuredName)
-	must.MapContainsKey(t, data[0].Gauges, remainingName)
 
-	configuredGauge := data[0].Gauges[configuredName]
-	must.Eq(t, float32(maxRunDuration.Seconds()), configuredGauge.Value)
+	configuredSuffix := "client.allocs.max_run_duration.configured_seconds;node_id=node-123;task_group=" + alloc.TaskGroup
+	remainingSuffix := "client.allocs.max_run_duration.remaining_seconds;node_id=node-123;task_group=" + alloc.TaskGroup
+
+	var configuredFound bool
+	var remainingFound bool
+
+	for key, gauge := range data[0].Gauges {
+		if strings.HasSuffix(key, configuredSuffix) {
+			must.Eq(t, float32(maxRunDuration.Seconds()), gauge.Value)
+			configuredFound = true
+		}
+
+		if strings.HasSuffix(key, remainingSuffix) {
+			must.Positive(t, gauge.Value)
+			must.True(t, gauge.Value <= float32(maxRunDuration.Seconds()))
+			remainingFound = true
+		}
+	}
 
-	remainingGauge := data[0].Gauges[remainingName]
-	must.Positive(t, remainingGauge.Value)
-	must.LessEq(t, remainingGauge.Value, float32(maxRunDuration.Seconds()))
+	must.True(t, configuredFound)
+	must.True(t, remainingFound)
 }