Skip to content

Commit 96f5189

Browse files
sql: Fix flaky TestInternalAppNamePrefix
Previously the test would assert that the internal metrics and user metrics increased or stayed the same based on the app name. However, for the internal metrics this was flaky, so instead of looking for the metric count to increase by 1, we just require that it increased, and most importantly that the user metrics don't increase when internal app name is set. Release note: None Fixes: #144094
1 parent a53735e commit 96f5189

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

pkg/sql/conn_executor_test.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2457,11 +2457,11 @@ func TestInternalAppNamePrefix(t *testing.T) {
24572457
initialInternalMetrics := sqlServer.InternalMetrics.ExecutedStatementCounters.InsertCount.Count()
24582458
initialUserMetrics := sqlServer.Metrics.ExecutedStatementCounters.InsertCount.Count()
24592459
runner.Exec(t, "INSERT into test values (1, 1)")
2460-
// Confirm only internal metrics increased.
2460+
// Confirm user metrics did not increase.
24612461
finalInternalMetrics := sqlServer.InternalMetrics.ExecutedStatementCounters.InsertCount.Count()
24622462
finalUserMetrics := sqlServer.Metrics.ExecutedStatementCounters.InsertCount.Count()
24632463
require.Equal(t, initialUserMetrics, finalUserMetrics)
2464-
require.Equal(t, initialInternalMetrics+1, finalInternalMetrics)
2464+
require.Greater(t, finalInternalMetrics, initialInternalMetrics)
24652465
})
24662466

24672467
t.Run("app name set in session", func(t *testing.T) {
@@ -2486,20 +2486,18 @@ func TestInternalAppNamePrefix(t *testing.T) {
24862486
runner.Exec(t, fmt.Sprintf("set application_name='%v'", catconstants.InternalAppNamePrefix+"mytest"))
24872487
runner.Exec(t, "INSERT into test values (2, 1)")
24882488

2489-
// Confirm only internal metrics increased.
2489+
// Confirm user metrics did not increase.
24902490
finalInternalMetrics := sqlServer.InternalMetrics.ExecutedStatementCounters.InsertCount.Count()
24912491
finalUserMetrics := sqlServer.Metrics.ExecutedStatementCounters.InsertCount.Count()
24922492
require.Equal(t, initialUserMetrics, finalUserMetrics)
2493-
require.Equal(t, initialInternalMetrics+1, finalInternalMetrics)
2493+
require.Greater(t, finalInternalMetrics, initialInternalMetrics)
24942494

24952495
// Reset app name.
24962496
runner.Exec(t, "set application_name='mytest'")
24972497
runner.Exec(t, "INSERT into test values (3, 1)")
24982498

2499-
// Confirm only user metrics increased.
2500-
finalInternalMetrics = sqlServer.InternalMetrics.ExecutedStatementCounters.InsertCount.Count()
2499+
// Confirm user metrics increased.
25012500
finalUserMetrics = sqlServer.Metrics.ExecutedStatementCounters.InsertCount.Count()
2502-
require.Equal(t, initialUserMetrics+1, finalUserMetrics)
2503-
require.Equal(t, initialInternalMetrics+1, finalInternalMetrics)
2501+
require.Greater(t, finalUserMetrics, initialUserMetrics)
25042502
})
25052503
}

0 commit comments

Comments
 (0)