chore: name unlabeled db transaction metrics (coder#15251)

Emyrk · web-flow · commit 7cb20d7b2625 · 2024-10-28T13:15:29.000-04:00
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
@@ -74,6 +74,11 @@ func (m metricsStore) InTx(f func(database.Store) error, options *database.TxOpt
 		options = database.DefaultTXOptions()
 	}
 
+	if options.TxIdentifier == "" {
+		// empty strings are hard to deal with in grafana
+		options.TxIdentifier = "unlabeled"
+	}
+
 	start := time.Now()
 	err := m.Store.InTx(f, options)
 	dur := time.Since(start)
@@ -82,13 +87,13 @@ func (m metricsStore) InTx(f func(database.Store) error, options *database.TxOpt
 	// So IDs should be used sparingly to prevent too much bloat.
 	m.txDuration.With(prometheus.Labels{
 		"success": strconv.FormatBool(err == nil),
-		"tx_id":   options.TxIdentifier, // Can be empty string for unlabeled
+		"tx_id":   options.TxIdentifier,
 	}).Observe(dur.Seconds())
 
 	m.txRetries.With(prometheus.Labels{
 		"success": strconv.FormatBool(err == nil),
 		"retries": strconv.FormatInt(int64(options.ExecutionCount()-1), 10),
-		"tx_id":   options.TxIdentifier, // Can be empty string for unlabeled
+		"tx_id":   options.TxIdentifier,
 	}).Inc()
 
 	// Log all serializable transactions that are retried.
diff --git a/coderd/database/dbmetrics/dbmetrics_test.go b/coderd/database/dbmetrics/dbmetrics_test.go
@@ -22,7 +22,7 @@ func TestInTxMetrics(t *testing.T) {
 
 	successLabels := prometheus.Labels{
 		"success": "true",
-		"tx_id":   "",
+		"tx_id":   "unlabeled",
 	}
 	const inTxHistMetricName = "coderd_db_tx_duration_seconds"
 	const inTxCountMetricName = "coderd_db_tx_executions_count"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func TestInTxMetrics(t *testing.T) {`
`22`	`22`
`23`	`23`	`successLabels := prometheus.Labels{`
`24`	`24`	`"success": "true",`
`25`		`- "tx_id": "",`
	`25`	`+ "tx_id": "unlabeled",`
`26`	`26`	`}`
`27`	`27`	`const inTxHistMetricName = "coderd_db_tx_duration_seconds"`
`28`	`28`	`const inTxCountMetricName = "coderd_db_tx_executions_count"`